fix(配发模块,维修模块): 无任务

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -272,11 +272,21 @@ public class AllotBillController {
 //                                .distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件",
 //                        null, ".", billId, 3,
 //                        userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
-                TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id,  "["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+ "]型号" +
+//                TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id,  "["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+ "]型号" +
+//                        StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel)
+//                                .distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件",
+//                        null, ".", billId, 3,
+//                        allotBillSaveVo.getSendUnitId(), 1, "country1", userIds);
+//                TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id,  "["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+ "]型号" +
+//                        StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel)
+//                                .distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件",
+//                        null, ".", billId, 3,
+//                        allotBillSaveVo.getSendUnitId(), 1, null, userIds);
+                TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_RECEIVE_FILE.id,  "["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit())+ "]型号" +
                         StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel)
                                 .distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件",
                         null, ".", billId, 3,
-                        allotBillSaveVo.getSendUnitId(), 1, "country1", userIds);
+                        allotBillSaveVo.getReceiveUnitId(), 1, null, userIds);
                 saveEntity = taskService.start(taskBto2);
             }
             //从草稿发起
@@ -284,7 +294,7 @@ public class AllotBillController {
                 TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
 //                taskBto.setTitle("["+allotBillSaveVo.getReceiveUnit().substring(0,3) + "]型号" + StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件");
                 taskBto.setTitle("["+DeviceModelSort.unitNameToDisName(allotBillSaveVo.getReceiveUnit()) + "]型号" + StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList())) + "的装备共" + allotBillSaveVo.getAllotCount() + "件");
-                taskBto.setCustomInfo("country1");
+//                taskBto.setCustomInfo("country1");
                 //添加当前操作人为涉及人员
                 TaskBto taskBto1 = taskService.addInvolveUser(taskBto, userId);
                 //推动任务到配发中状态
@@ -379,14 +389,14 @@ public class AllotBillController {
         //发送阅知信息
         List<Integer> idList = userPublicService.findOtherUser(userId);
         //纵向配发阅知要发给收件单位的人
-        if (allotBillSaveVo.getAllotType() == 1) {
+//        if (allotBillSaveVo.getAllotType() == 1) {
 //            idList.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBillEntity.getReceiveUnit())).stream()
 //                    .map(User::getUserId)
 //                    .collect(Collectors.toList()));
                     idList.addAll(userDao.findAllByUnitsId(allotBillSaveVo.getReceiveUnitId()).stream()
                     .map(User::getUserId)
                     .collect(Collectors.toList()));
-        }
+//        }
         //给被选签发人推阅知
 //        if (allotBillSaveVo.getSendUserbId() != null) {
 //            List<Integer> idList1 = new ArrayList<>();

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

@@ -367,7 +367,7 @@ public class RepairController {
         if (repairBillSaveVo.getScriptSaveVos() != null) {
             deviceRepairSendBillEntity.setScriptJson(JacksonUtil.toJSon(repairBillSaveVo.getScriptSaveVos()));
         }
-        //如果当前为省向国家发起的
+        //如果当前为省向国家发起的   省直属  level=1 type = 2
         if (level == 1 && units.getType() == 1) {
             repairBill.setRepairStatus(4);//维修中
             deviceRepairSendBillEntity.setRepairStatus(5);//维修中
@@ -596,7 +596,7 @@ public class RepairController {
                 deviceRepairDetailService.save(repairDetail);
             }
             //如果当前为省像国家发起的
-            if (level == 1) {
+            if (level == 1 && units1.getType() == 1) {
                 deviceLibraryEntity.setLifeStatus(4);
                 deviceLibraryEntity.setLocationUnit(repairBillSaveVo.getReceiveUnit());
                 deviceLibraryEntity.setStorageLocationId(0);
@@ -623,7 +623,7 @@ public class RepairController {
         String deviceIdDetail = deviceRepairSendBillEntity.getRepairDeviceCheckDetail();
         List<Integer> idList = StringSplitUtil.split(deviceIdDetail);
         //如果当前为省，改变装备的所在为中办
-        if (level == 1) {
+        if (level == 1 && units1.getType() == 1) {
             //获取当前业务维修详情  记录
             List<RepairDetail> repairDetailEntities = deviceRepairDetailService.findByBillId(repairBill.getId());
             //改变维修详情装备所在单位为中办,状态为维修中