计量支付项相关

Signed-off-by: liuyc <56808083@qq.com>

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

@@ -1525,7 +1525,7 @@ public class TaskController extends BladeController {
 
                 /*修改部位变更金额*/
                 ChangeTokenMeterTask changeTokenMeterTask = changeTokenMeterServiceTask.getBaseMapper().selectById(dto.getPrimaryKeyIdMeter());
-                List<ChangeFormVO2> formListCopyByMeterId = changeTokenFormService.getBaseMapper().getFormListCopyByMeterId(dto.getContractId(), dto.getDataId(), changeTokenMeterTask.getContractMeterId());
+                List<ChangeFormVO2> formListCopyByMeterId = changeTokenFormService.getBaseMapper().getFormListCopyByMeterId(Long.parseLong(task.getContractId()), dto.getDataId(), changeTokenMeterTask.getContractMeterId());
                 BigDecimal sumOfCurrentChangeMoneyByMeterId = formListCopyByMeterId.stream().map(ChangeFormVO2::getCurrentChangeMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
                 BigDecimal add = changeTokenMeterTask.getChangeMoney().add(sumOfCurrentChangeMoneyByMeterId);
                 String updateSqlMeter = "UPDATE s_change_token_meter_task SET change_money = ? WHERE id = ?";
@@ -1533,7 +1533,7 @@ public class TaskController extends BladeController {
                 jdbcTemplate.update(updateSqlMeter, updateParamsMeter);
 
                 /*修改变更令申请金额*/
-                List<ChangeFormVO2> formListCopyAll = changeTokenFormService.getBaseMapper().getFormListCopy(dto.getContractId(), dto.getDataId());
+                List<ChangeFormVO2> formListCopyAll = changeTokenFormService.getBaseMapper().getFormListCopy(Long.parseLong(task.getContractId()), dto.getDataId());
                 BigDecimal sumOfCurrentChangeMoneyAll = formListCopyAll.stream().map(ChangeFormVO2::getCurrentChangeMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
                 String updateSqlForm = "UPDATE s_change_token_form_task SET change_money = ? WHERE id = ?";
                 Object[] updateParamsForm = {sumOfCurrentChangeMoneyAll, dto.getDataId()};
@@ -1686,7 +1686,7 @@ public class TaskController extends BladeController {
 
             Set<String> aopParamsSet = new HashSet<>();
             for (TaskParallel taskParallel : taskParallels) {
-                String param = taskParallel.getTaskUser() + "," + dto.getProjectId() + "," + dto.getContractId();
+                String param = taskParallel.getTaskUser() + "," + task.getProjectId() + "," + task.getContractId();
                 aopParamsSet.add(param);
             }
             return R.data(200, aopParamsSet, "操作成功");