详情联合报工 暂存

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<TaskDispatchDetailDO> 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<TaskDispatchDetailDO> 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<TaskDispatchDetailDO> 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);
+
 
         });