From 5e22589bebc508a4a10a208e9baddf198ca78e56 Mon Sep 17 00:00:00 2001 From: siontion Date: Sat, 13 Jul 2024 23:18:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=81=94=E5=90=88=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=20=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskdispatch/TaskDispatchServiceImpl.java | 52 ++++++++++++------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java index 375c5a3d..5463b2f2 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/taskdispatch/TaskDispatchServiceImpl.java @@ -415,21 +415,25 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { taskReportMapper.updateById(lastReportDO); break; case SUBMIT: - lastReportDO =new TaskReportDO(); - lastReportDO.setDispatchId(taskDispatchDetailDO.getDispatchId()) - .setDispatchDetailId(taskDispatchDetailDO.getId()) - .setProcedureId(taskDispatchDetailDO.getProcedureId()) - .setStartTime(now) - .setEndTime(now) - .setOwner(SecurityFrameworkUtils.getLoginUserId()); - taskReportMapper.insert(lastReportDO); - + List taskDispatchDetailSubmitDOS = taskDispatchDetailMapper.selectList(TaskDispatchDetailDO::getDetailOwnerId,taskDispatchDetailDO.getDetailOwnerId()); + taskDispatchDetailSubmitDOS.forEach(uo->{ + TaskReportDO newReportDO =new TaskReportDO(); + newReportDO.setDispatchId(taskDispatchDetailDO.getDispatchId()) + .setDispatchDetailId(taskDispatchDetailDO.getId()) + .setProcedureId(taskDispatchDetailDO.getProcedureId()) + .setStartTime(now) + .setEndTime(now) + .setOwner(SecurityFrameworkUtils.getLoginUserId()); + taskReportMapper.insert(newReportDO); + + + newReportDO.setAmount(operateReqVO.getAmount()) + .setWorkTime(operateReqVO.getWorkTime()) + .setReportTime(now) + .setHasReport(YesOrNoEnum.Y.getCode()); + taskReportMapper.updateById(newReportDO); + }); - lastReportDO.setAmount(operateReqVO.getAmount()) - .setWorkTime(operateReqVO.getWorkTime()) - .setReportTime(now) - .setHasReport(YesOrNoEnum.Y.getCode()); - taskReportMapper.updateById(lastReportDO); // TODO 缺少事务 考虑删除接口 失败调用接口删除 // 生成报工单 @@ -440,8 +444,13 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { }*/ break; case FINISH: - taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode()); - taskDispatchDetailMapper.updateById(taskDispatchDetailDO); + List taskDispatchDetailDOS = taskDispatchDetailMapper.selectList(TaskDispatchDetailDO::getDetailOwnerId,taskDispatchDetailDO.getDetailOwnerId()); + taskDispatchDetailDOS.forEach(uo->{ + uo.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode()); + taskDispatchDetailMapper.updateById(uo); + }); +// taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode()); +// taskDispatchDetailMapper.updateById(taskDispatchDetailDO); break; } } @@ -489,11 +498,18 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { .setOwner(Long.valueOf(oid.trim())); taskReportMapper.insert(taskReportDO); + + + }); + + List taskDispatchDetailDOS = taskDispatchDetailMapper.selectList(TaskDispatchDetailDO::getDetailOwnerId,taskDispatchDetailOwnerDO.getId()); + taskDispatchDetailDOS.forEach(uo->{ + uo.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode()); + taskDispatchDetailMapper.updateById(uo); }); - taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode()); - taskDispatchDetailMapper.updateById(taskDispatchDetailDO); + });