update

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

@@ -222,12 +222,12 @@ public class AllotBillController {
                 saveEntity = taskService.moveToSpecial(taskBto1, StatusEnum.ALLOTING, 0);
             }
             //生成发件方上传配发单的子任务
-            TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_FILE.id, allotBillSaveVo.getSendUnit()+"配发型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 0, null, Collections.singletonList(0));
+            TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_FILE.id, allotBillSaveVo.getSendUnit()+"配发型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备共"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 0, null, Collections.singletonList(0));
             taskService.start(taskBto2);
         }
         //横向配发
         else {
-            TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id, allotBillSaveVo.getSendUnit()+"配发型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
+            TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_CROSS_FILE.id, allotBillSaveVo.getSendUnit()+"配发型号"+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备共"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 1, "country", userIds);
             saveEntity = taskService.start(taskBto2);
         }
         List<FileVo> fileVoList = new ArrayList<>();

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

@@ -788,7 +788,7 @@ public class RepairController {
             repairBackBill1.setDocNum(s1);
             deviceRepairBackBillService.update(repairBackBill1);
             //发起任务
-            TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_BACK_DRAFT.id, repairBackBillSaveVo.getSendUnit()+"向"+repairBackBillSaveVo.getReceiveUnit()+"维修退回,型号为："+repairBackBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBackBillSaveVo.getSendingCount()+"件", null,  ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id,userUtils.getCurrentUnitId(), 0, null, userIds);
+            TaskBto taskBto = new TaskBto(StatusEnum.REPAIR_BACK_DRAFT.id, repairBackBillSaveVo.getSendUnit()+"向"+repairBackBillSaveVo.getReceiveUnit()+"维修退回型号为"+repairBackBillSaveVo.getScriptSaveVos().get(0).getModel()+"共有多少"+repairBackBillSaveVo.getSendingCount()+"件", null,  ".", repairBackBill1.getId(), BusinessEnum.REPAIR_BACK.id,userUtils.getCurrentUnitId(), 0, null, userIds);
             TaskBto taskBto1 = taskService.start(taskBto);
             Integer id = taskBto1.getId();
             myWebSocket.sendMessage1();
@@ -840,7 +840,7 @@ public class RepairController {
         }
         repairBackBill.setBackStatus(2);
         repairBackBill.setSendTime(new Date());
-        repairBackBill.setTitle(repairBackBillSaveVo.getSendUnit()+"向"+repairBackBillSaveVo.getReceiveUnit()+"维修退回");
+        repairBackBill.setTitle(repairBackBillSaveVo.getSendUnit()+"维修退回型号为："+StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBillSaveVo.getSendingCount()+"件至"+repairBackBillSaveVo.getReceiveUnit());
         repairBackBill.setAgent(repairBackBillSaveVo.getAgent());
         //生成单位签章id
         Long signId2 = snowflake.creatNextId();
@@ -863,7 +863,7 @@ public class RepairController {
         TaskBto task;
         //草稿发起
         if (repairBackBillSaveVo.getTaskId()==null) {
-            TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id, repairBackBillSaveVo.getSendUnit()+"维修退回,型号为："+StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBillSaveVo.getSendingCount()+"件，至"+repairBackBillSaveVo.getReceiveUnit(), null, ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
+            TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id, repairBackBillSaveVo.getSendUnit()+"维修退回型号为："+StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBillSaveVo.getSendingCount()+"件至"+repairBackBillSaveVo.getReceiveUnit(), null, ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
             task = taskService.start(taskBto1);
         }
         else {
@@ -871,7 +871,7 @@ public class RepairController {
             taskBto1.setOwnUnit(userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()));
             task = taskService.moveToSpecial(taskBto1,StatusEnum.WAIT_BACK_RECEIVE);
         }
-        TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_SEND_FILE.id, repairBackBillSaveVo.getSendUnit()+"维修退回,型号为："+StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBillSaveVo.getSendingCount()+"件，至"+repairBackBillSaveVo.getReceiveUnit(), task.getId(), task.getNodeIdDetail() + task.getId() + ".", task.getBillId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getSendUnit()), 0, null, Collections.singletonList(0));
+        TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_SEND_FILE.id, repairBackBillSaveVo.getSendUnit()+"维修退回型号："+StringSplitUtil.stringListToString(repairBackBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"共有"+repairBackBillSaveVo.getSendingCount()+"件至"+repairBackBillSaveVo.getReceiveUnit(), task.getId(), task.getNodeIdDetail() + task.getId() + ".", task.getBillId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getSendUnit()), 0, null, Collections.singletonList(0));
         taskService.start(taskBto2);
         //添加业务日志
         List<FileVo> fileVoList = new ArrayList<>();