fix(培训模块): 设备数据需要查询实时的完结之后在查询保存的

dev-train/src/main/java/com/tykj/dev/device/train/controller/HandoverController.java

@@ -31,6 +31,7 @@ public class HandoverController {
 
     @Autowired
     WorkHandoverService workHandoverService;
+
     @Autowired
     UserService userService;
 

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/WorkHandoverEndAddVo.java

 package com.tykj.dev.device.train.entity.vo;
 
 import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.train.entity.WorkHandoverDev;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -38,4 +39,9 @@ public class WorkHandoverEndAddVo {
      * 文件集合(装备列表签字文件集合)
      */
     private List<FileRet> fileLists;
+
+    /**
+     * 单据装备数据统计数据
+     */
+    List<WorkHandoverDev> workHandoverDevices;
 }

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java

@@ -89,12 +89,6 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
         workHandover.setInitiateUserId(securityUser.getCurrentUserInfo().getUserId());
         //创建workHandoverDB 存储数据库
         workHandover = workHandoverDao.save(workHandover);
-        Integer id=workHandover.getWorkHandoverId();
-        List<WorkHandoverDev> workHandoverDevs=workHandoverAddVo.getWorkHandoverDevices();
-        workHandoverDevs.forEach(
-                workHandoverDev -> workHandoverDev.setWordId(id)
-        );
-        workHandoverDevDao.saveAll(workHandoverDevs);
         List<Integer> integers = new ArrayList<>();
         integers.add(securityUser.getCurrentUserInfo().getUserId());
         TaskBto taskBto= taskService.start(new TaskBto(StatusEnum.WORKHANDOVER1011.id, "工作交接", null, null, workHandover.getWorkHandoverId(), BusinessEnum.WORK_HANDOVER.id, securityUser.getCurrentUserInfo().getUnitsId(), 0, null, integers));
@@ -144,6 +138,13 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
                     userLogService.save(new UserLog(user.getUserId(),new Date(),"交接成功完成，账号冻结"));
                 }
         );
+        //保存装备信息列表
+        Integer id=workHandover.getWorkHandoverId();
+        List<WorkHandoverDev> workHandoverDevs=workHandoverEndAddVo.getWorkHandoverDevices();
+        workHandoverDevs.forEach(
+                workHandoverDev -> workHandoverDev.setWordId(id)
+        );
+        workHandoverDevDao.saveAll(workHandoverDevs);
         userService.saveAll(users);
         return workHandover;
     }