update

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

@@ -207,13 +207,13 @@ public class AllotBillController {
         if (allotBillSaveVo.getAllotType()==1) {
             //直接发起
             if (allotBillSaveVo.getTaskId() == null) {
-                TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, "配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
+                TaskBto taskBto = new TaskBto(StatusEnum.ALLOTING.id, allotBillSaveVo.getSendUnit()+"配发型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备,共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 3, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
                 saveEntity = taskService.start(taskBto);
             } 
             //从草稿发起
             else {
                 TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
-                taskBto.setTitle("配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit());
+                taskBto.setTitle(allotBillSaveVo.getSendUnit()+"配发型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备,共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit());
                 //添加当前操作人为涉及人员
                 TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userId);
                 //任务所属单位改为收件单位
@@ -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.getScriptSaveVos().get(0).getModel()+"的装备给"+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.getScriptSaveVos().get(0).getModel()+"的装备给"+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<>();
@@ -498,7 +498,7 @@ public class AllotBillController {
             allotBill1.setSendUseraId(userId);
             AllotBill allotBill = allotBillService.addEntity(allotBill1);
             //发起草稿任务
-            TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, "配发型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
+            TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_DRAFT.id, allotBillSaveVo.getSendUnit()+"配发型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))  +"的装备,共"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBill.getId(), 3, userUtils.getCurrentUnitId(), 0, null, userIds);
             TaskBto taskBto1 = taskService.start(taskBto);
             //返回保存成功的id
             Integer id = taskBto1.getId();

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

@@ -141,7 +141,8 @@ public class BackController {
         TaskBto saveEntity;
         //直接发起
         if (allotBillSaveVo.getTaskId()==null) {
-            TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, "退回型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
+
+            TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, allotBillSaveVo.getSendUnit()+"退回型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备,共有"+allotBillSaveVo.getAllotCount()+"件至"+allotBillSaveVo.getReceiveUnit(), null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
             saveEntity = taskService.start(taskBto);
         }
         //从草稿发起
@@ -155,7 +156,7 @@ public class BackController {
             saveEntity = taskService.moveToSpecial(taskBto1,StatusEnum.ALLOT_BACKING,0);
         }
         //生成发件方上传退回单的子任务
-        TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, "退回型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
+        TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.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(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
         taskService.start(taskBto2);
         List<FileVo> fileVoList = new ArrayList<>();
         //存装备日志
@@ -484,7 +485,7 @@ public class BackController {
             allotBackBill.setSendUseraId(userId);
             AllotBackBill allotBackBill1 = allotBackBillService.addEntity(allotBackBill);
             //发起草稿任务
-            TaskBto taskBto = new TaskBto(StatusEnum.BACK_DRAFT.id, "退回型号为："+allotBillSaveVo.getScriptSaveVos().get(0).getModel()+"的装备给"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, null, userIds);
+            TaskBto taskBto = new TaskBto(StatusEnum.BACK_DRAFT.id, allotBillSaveVo.getSendUnit()+"退回型号为："+StringSplitUtil.stringListToString(allotBillSaveVo.getScriptSaveVos().stream().map(ScriptSaveVo::getModel).distinct().collect(Collectors.toList()))+"的装备,共有"+allotBillSaveVo.getAllotCount()+"件，至"+allotBillSaveVo.getReceiveUnit(), null, ".", allotBackBill1.getId(), 22, userUtils.getCurrentUnitId(), 0, null, userIds);
             TaskBto taskBto1 = taskService.start(taskBto);
             //返回保存成功的id
             Integer id = taskBto1.getId();