diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java index 5154730d..ec7e88f5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lossAssessment/service/impl/LossAssessmentServiceImpl.java @@ -247,25 +247,9 @@ public class LossAssessmentServiceImpl implements LossAssessmentService { try { LoginUser loginUser = SecurityUtils.getLoginUser(); for (RepairTask task : taskList) { -// //1、查询任务下的定损数据,是否还有未完成的数据 List detailsList = mapper.getRepairDetailsWhichNotSent(task.getTaskId()); -// if (!CollectionUtils.isEmpty(detailsList)) { -// BigDecimal repairedNum = BigDecimal.ZERO; -// BigDecimal scrapNum = BigDecimal.ZERO; -// String taskCode = ""; -// for (RepairTaskDetails repairTaskDetails : detailsList) { -// repairedNum = repairedNum.add(repairTaskDetails.getRepairedNum()); -// scrapNum = scrapNum.add(repairTaskDetails.getScrapNum()); -// taskCode = repairTaskDetails.getTaskCode(); -// } -// if (repairedNum.add(scrapNum).compareTo(BigDecimal.ZERO) == 0) { -// return AjaxResult.error("单号" + taskCode + "还未进行定损,请先定损后再提交!"); -// } -// } //2、修改任务状态 mapper.updateSingleTaskStatus(task, loginUser.getUserid(), RepairTaskStatusEnum.TASK_LOSS_ASSESSMENT_COMPLETE.getStatus()); - //将数据status状态都置为1 -// mapper.updateStatus(task.getTaskId()); //3、重新生成维修数据 for (RepairTaskDetails repairTaskDetails : detailsList){ repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName()); @@ -387,8 +371,6 @@ public class LossAssessmentServiceImpl implements LossAssessmentService { RepairTask task = new RepairTask(); task.setTaskId(bean.getTaskId()); mapper.updateSingleTaskStatus(task, loginUser.getUserid(), RepairTaskStatusEnum.TASK_LOSS_ASSESSMENT_COMPLETE.getStatus()); - //将数据status状态都置为1 -// mapper.updateStatus(task.getTaskId()); //3、重新生成维修数据 for (RepairTaskDetails repairTaskDetails : detailsList){ repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());