计量单bug

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2079,7 +2079,7 @@ public class TaskController extends BladeController {
                         vo.setBasicsInfo(middleMeterApplyTaskVO);
 
                         /*清单信息*/
-                        List<MeterInventoryVO> formToTask = middleMeterApplyMapper.getFormCopy(Long.parseLong(dataId), middleMeterApplyTask.getContractId(), middleMeterApplyTask.getContractUnitId());
+                        List<MeterInventoryVO> formToTask = middleMeterApplyMapper.getFormCopy(Long.parseLong(dataId), middleMeterApplyTask.getContractId(), middleMeterApplyTask.getContractUnitId(),Long.valueOf(id));
                         for (MeterInventoryVO inventoryVO : formToTask) {
                             inventoryVO.setCurrentMeterMoney(inventoryVO.getCurrentMeterMoney().setScale(0,BigDecimal.ROUND_HALF_UP));
                         }
@@ -2278,7 +2278,7 @@ public class TaskController extends BladeController {
                             jdbcTemplate.execute("DELETE FROM s_inventory_form_apply WHERE id = " + inventoryFormApplyTask.getId());
 
                             /*清单信息*/
-                            List<MeterInventoryVO> formToTask = middleMeterApplyMapper.getFormCopy(middleMeterApplyTask.getId(), middleMeterApplyTask.getContractId(), middleMeterApplyTask.getContractUnitId());
+                            List<MeterInventoryVO> formToTask = middleMeterApplyMapper.getFormCopy(middleMeterApplyTask.getId(), middleMeterApplyTask.getContractId(), middleMeterApplyTask.getContractUnitId(),Long .valueOf(dto.getTaskId()));
                             if (formToTask == null || formToTask.size() == 0) {
                                 /*删除该条中间计量的清单附件*/
                                 jdbcTemplate.execute("DELETE FROM s_attachment_form_task WHERE file_type = 2 AND master_id = " + dto.getDataId());
@@ -2406,7 +2406,7 @@ public class TaskController extends BladeController {
                 if (middleMeterApplyTask != null) {
 
                     /*清单信息*/
-                    List<MeterInventoryVO> formToTask = middleMeterApplyMapper.getFormCopy(middleMeterApplyTask.getId(), middleMeterApplyTask.getContractId(), middleMeterApplyTask.getContractUnitId());
+                    List<MeterInventoryVO> formToTask = middleMeterApplyMapper.getFormCopy(middleMeterApplyTask.getId(), middleMeterApplyTask.getContractId(), middleMeterApplyTask.getContractUnitId(),dto.getTaskId());
 
                     BigDecimal totalSumMoney = BigDecimal.ZERO;
                     for (MeterInventoryVO meterInventoryVO : formToTask) {
@@ -2494,7 +2494,7 @@ public class TaskController extends BladeController {
                     inventoryFormApplyServiceTask.saveBatch(formAppliesTask);
 
                     /*获取当前所有清单信息*/
-                    List<MeterInventoryVO> formToTask = middleMeterApplyMapper.getFormCopy(middleMeterApplyTask.getId(), middleMeterApplyTask.getContractId(), middleMeterApplyTask.getContractUnitId());
+                    List<MeterInventoryVO> formToTask = middleMeterApplyMapper.getFormCopy(middleMeterApplyTask.getId(), middleMeterApplyTask.getContractId(), middleMeterApplyTask.getContractUnitId(),dto.getTaskId());
 
                     BigDecimal totalSum = BigDecimal.ZERO;
                     for (MeterInventoryVO meterInventoryVO : formToTask) {

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.java

@@ -62,7 +62,7 @@ public interface MiddleMeterApplyMapper extends BaseMapper<MiddleMeterApply> {
 
     List<MeterInventoryVO> getForm(@Param("id") Long id,@Param("contractId") Long contractId,@Param("nodeId") Long nodeId);
 
-    List<MeterInventoryVO> getFormCopy(@Param("id") Long id,@Param("contractId") Long contractId,@Param("nodeId") Long nodeId);
+    List<MeterInventoryVO> getFormCopy(@Param("id") Long id,@Param("contractId") Long contractId,@Param("nodeId") Long nodeId,@Param("taskId")Long taskId);
 
     ChangeTokenForm getTokenById(@Param("id") Long id);
 

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -196,7 +196,7 @@
                                                                                       and contract_meter_id = #{nodeId} and contract_form_id = ifa.contract_form_id),0)) as allMeterTotal
         from s_inventory_form_apply_task ifa
         where ifa.contract_id = #{contractId} and ifa.is_deleted = 0
-          AND ifa.middle_meter_id = #{id}
+          AND ifa.middle_meter_id = #{id} ANd  ifa.task_id = #{taskId}
     </select>
 
     <select id="getTokenById" resultType="org.springblade.meter.entity.ChangeTokenForm">