[清退] bug的提交

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

@@ -74,7 +74,7 @@ public enum StatusEnum {
     SEND_BACK_1201(1201, "市清退任务待执行"),
     SEND_BACK_1202(1202, "省直属装备待清退"),
     SEND_BACK_1203(1203, "省本级装备待清退"),
-    SEND_BACK_1204(1204, "市清退任务待各市提交"),
+    SEND_BACK_1204(1204, "市清退任务待各区提交"),
     SEND_BACK_1205(1205, "区清退任务待执行"),
     SEND_BACK_1206(1206, "等待选择清退装备"),
     SEND_BACK_1207(1207, "清退装备等待审核确认"),

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -193,7 +193,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
             TaskBto  taskBto1 =  oneselfTask(units.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(), taskBto.getId(),deviceRepel.getTitle());
             list.add(new RepelTaskStatistical(deviceRepel1.getId(),taskBto.getId(),taskBto1.getId(),0,"省本级",JacksonUtil.toJSon(modelCounts),""));
         }
-
+        if (list==null||list.size()==0){
+            taskService.moveToSpecial(taskBto, StatusEnum.SEND_BACK_1212,userId);
+        }
         repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
 //        isEnd(taskBto,deviceRepel1.getId());
     }
@@ -253,6 +255,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                     }
                 }
         );
+        if (list==null||list.size()==0){
+            taskService.moveToSpecial(taskBto, StatusEnum.SEND_BACK_1212,userId);
+        }
       repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
       TaskBto currentTask= taskService.get(taskId);
       taskService.moveToSpecial(currentTask,StatusEnum.SEND_BACK_1206);
@@ -330,11 +335,14 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
                         }
                     }
             );
-            repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
-            taskBto.setOwnUnit(deviceRepel.getUnitId());
-            taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1204,-1);
+            if (list==null||list.size()==0){
+                taskService.moveToSpecial(taskBto, StatusEnum.SEND_BACK_1212,userId);
+            }else {
+                repelTaskStatisticalService.saveAllRepelTaskStatistical(list);
+                taskBto.setOwnUnit(deviceRepel.getUnitId());
+                taskService.moveToSpecial(taskBto, StatusEnum.SEND_BACK_1204, -1);
 //            isEnd(taskBto,deviceRepel.getId());
-
+            }
         }else {
             taskService.moveToEnd(taskBto);
         }
@@ -513,7 +521,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
        List<RepelDeviceUnit> list=new ArrayList<>();
        TaskBto taskBto= taskService.get(taskId);
        DeviceRepelDetail deviceRepelDetail = deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
-       deviceRepelDetail.setReceiveUserB(storageDeviceRepel.getUserBName());
+       if (storageDeviceRepel.getUserBName()!=null) {
+           deviceRepelDetail.setReceiveUserB(storageDeviceRepel.getUserBName());
+       }
        if (storageDeviceRepel.getUserB()!=null){
            deviceRepelDetail.setReceiveUserbId(storageDeviceRepel.getUserB());
 
@@ -522,7 +532,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
             deviceRepelDetail.setReceiveUseraId(storageDeviceRepel.getUserA());
 
         }
-       deviceRepelDetail.setReceiveUserA(storageDeviceRepel.getUserBName());
+        if (storageDeviceRepel.getUserBName()!=null) {
+            deviceRepelDetail.setReceiveUserA(storageDeviceRepel.getUserBName());
+        }
        //判断是否为入库单据待补充 还是直接入库。
        if (storageDeviceRepel.getFileRets()!=null&&storageDeviceRepel.getFileRets().size()!=0) {
            List<StatusEnum> enumList=new ArrayList<>();
@@ -878,7 +890,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
      * 判读是否留在代办
      */
     private void isCommission(TaskBto taskBto,Integer repelId){
-      boolean flag=  repelTaskStatisticalService.findAllRepelTaskStatistical(taskBto.getParentTaskId(),repelId).stream().allMatch(e->e.getTaskStatus()!=3);
+      boolean flag= repelTaskStatisticalService.findAllRepelTaskStatistical(taskBto.getParentTaskId(),repelId).stream().allMatch(e->e.getTaskStatus()!=3);
       if (flag){
          TaskBto  parentTask= taskService.get(taskBto.getParentTaskId());
          taskService.moveToSpecial(parentTask, GlobalMap.getStatusEnumMap().get(parentTask.getBillStatus()),-1);
@@ -892,7 +904,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         boolean flag=  repelTaskStatisticalService.findAllRepelTaskStatistical(taskBto.getParentTaskId(),repelId).stream().allMatch(e->e.getTaskStatus()==1);
         if (flag){
             TaskBto parentTask= taskService.get(taskBto.getParentTaskId());
-            taskService.moveToSpecial(parentTask,StatusEnum.SEND_BACK_1212,0);
+            if (parentTask.getBillStatus()!=StatusEnum.END.id) {
+                taskService.moveToSpecial(parentTask, StatusEnum.SEND_BACK_1212, 0);
+            }
         }
     }
 

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -78,6 +78,8 @@ public class RepelQueryServiceImpl implements RepelQueryService {
                 if (deviceLibrary.getOwnUnit().equals(deviceLibrary.getLocationUnit())){
                     if (deviceLibrary.getLifeStatus()==2||deviceLibrary.getLifeStatus()==15 ||deviceLibrary.getLifeStatus()==4) {
                         deviceLibraries.add(deviceLibrary);
+                    }else {
+                        deviceLibrariesAbnormal.add(deviceLibrary);
                     }
                 }else {
                     deviceLibrariesAbnormal.add(deviceLibrary);