更新

dev-misc/src/main/java/com/tykj/dev/misc/base/RepairStatusEnum.java

@@ -40,7 +40,11 @@ public enum RepairStatusEnum {
     /**
      * 已领取待入库
      */
-    RECEIVE_WAIT_STORAGE(7, "已领取待入库");
+    RECEIVE_WAIT_STORAGE(7, "已领取待入库"),
+    /**
+     * 等待上级维修装备送回
+     */
+    WAIT_BACK(8, "等待上级维修装备送回");
 
     public Integer id;
 

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java

@@ -175,16 +175,17 @@ public class RepairController {
         }
         //存维修详情单
         for (DeviceDetailVo d : repairBillSaveVo.getDeviceList()) {
-            if (d.getId()!=null){
-                RepairDetail repairDetail = deviceRepairDetailService.getOne(d.getId());
-                repairDetail.setRepairStatus(2);
-                deviceRepairDetailService.update(repairDetail);
-            }
             stringBuffer.append(d.getDeviceId());
             stringBuffer.append("Ǵ");
             stringBuffer.append(d.getRemark());
             stringBuffer.append("Ǵ");
             RepairDetail repairDetail = new RepairDetail();
+            if (d.getId()!=null){
+                repairDetail.setPid(d.getId());
+                RepairDetail repairDetail1 = deviceRepairDetailService.getOne(d.getId());
+                repairDetail1.setRepairStatus(8);
+                deviceRepairDetailService.update(repairDetail1);
+            }
             repairDetail.setDeviceId(d.getDeviceId());
             DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(d.getDeviceId());
             repairDetail.setLocationUnit(userUtils.getCurrentUserUnitName());
@@ -480,15 +481,15 @@ public class RepairController {
             }
         }
         //获取所有父业务id
-        List<Integer> fathers = StringSplitUtil.taskIdSplit(taskBto.getNodeIdDetail());
-        fathers.forEach(integer -> {
-            //筛选出父业务相同装备的维修详情
-            List<RepairDetail> repairDetails = repairDetailDao.findByDeviceRepairBillId(taskService.get(integer).getBillId()).stream()
-                    .filter(repairDetail -> idList.contains(repairDetail.getDeviceId()))
-                    .collect(Collectors.toList());
-            //添加维修详情
-            repairDetailEntities.addAll(repairDetails);
-        });
+//        List<Integer> fathers = StringSplitUtil.taskIdSplit(taskBto.getNodeIdDetail());
+//        fathers.forEach(integer -> {
+//            //筛选出父业务相同装备的维修详情
+//            List<RepairDetail> repairDetails = repairDetailDao.findByDeviceRepairBillId(taskService.get(integer).getBillId()).stream()
+//                    .filter(repairDetail -> idList.contains(repairDetail.getDeviceId()))
+//                    .collect(Collectors.toList());
+//            //添加维修详情
+//            repairDetailEntities.addAll(repairDetails);
+//        });
         //改变维修详情装备所在单位为当前单位
         repairDetailEntities.forEach(repairDetail -> {
             repairDetail.setLocationUnit(userUtils.getCurrentUserUnitName());
@@ -889,6 +890,11 @@ public class RepairController {
             repairDetailList.forEach(repairDetail -> {
 //            repairDetail.setLocationUnit(userUtils.getCurrentUserUnitName());
                 repairDetail.setRepairStatus(5);
+                if (repairDetail.getPid()!=null) {
+                    RepairDetail repairDetail1 = deviceRepairDetailService.getOne(repairDetail.getPid());
+                    repairDetail1.setRepairStatus(2);
+                    deviceRepairDetailService.update(repairDetail1);
+                }
                 deviceRepairDetailService.update(repairDetail);
             });
         }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairDetail.java

@@ -34,6 +34,8 @@ public class RepairDetail {
     @ApiModelProperty(name = "主键id")
     private Integer id;
 
+    @ApiModelProperty(name = "父id")
+    private Integer pid;
 
     /**
      * 装备id