更新

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

@@ -149,7 +149,9 @@ public class AllotBillController {
     @PostMapping(value = "/addAllotBill")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addAllotBill(@RequestBody @Validated AllotBillSaveVo allotBillSaveVo) {
-        deviceLibraryService.isInStockOrWaitRetired(StringSplitUtil.split(allotBillSaveVo.getAllotCheckDetail()));
+        if (allotBillSaveVo.getAllotCheckDetail()!=null&&allotBillSaveVo.getAllotCheckDetail().length()>0) {
+            deviceLibraryService.isInStockOrWaitRetired(StringSplitUtil.split(allotBillSaveVo.getAllotCheckDetail()));
+        }
         //1.添加配发单
         AllotBill a = allotBillSaveVo.toDo();
         a.setSendUseraId(userUtils.getCurrentUserId());

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

@@ -88,7 +88,9 @@ public class BackController {
     @PostMapping(value = "/addBackBill")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addBackBill(@RequestBody @Validated AllotBillSaveVo allotBillSaveVo) {
-        deviceLibraryService.isInStockOrWaitRetired(StringSplitUtil.split(allotBillSaveVo.getAllotCheckDetail()));
+        if (allotBillSaveVo.getAllotCheckDetail()!=null&&allotBillSaveVo.getAllotCheckDetail().length()>0) {
+            deviceLibraryService.isInStockOrWaitRetired(StringSplitUtil.split(allotBillSaveVo.getAllotCheckDetail()));
+        }
         //1.添加配发单
         AllotBackBill a = allotBillSaveVo.toBackDo();
         a.setSendUseraId(userUtils.getCurrentUserId());

dev-misc/src/main/java/com/tykj/dev/misc/utils/StringSplitUtil.java

@@ -17,17 +17,19 @@ public class StringSplitUtil {
      */
     public static List<Integer> split(String s) {
         List<Integer> list = new ArrayList<>();
-        //分隔开始的s标识符
-        if (s.charAt(0) == 's') {
-            s = s.substring(1);
-        }
-        //按分隔符x分隔
-        String[] strings = s.split("x");
-        //遍历获取id\
-        if (strings.length > 0) {
-            for (String str : strings) {
-                if (str.length() >= 2 && "1".equals(str.substring(str.length() - 1))) {
-                    list.add(Integer.parseInt(str.substring(0, str.length() - 1)));
+        if (s!=null&&s.length()>0) {
+            //分隔开始的s标识符
+            if (s.charAt(0) == 's') {
+                s = s.substring(1);
+            }
+            //按分隔符x分隔
+            String[] strings = s.split("x");
+            //遍历获取id\
+            if (strings.length > 0) {
+                for (String str : strings) {
+                    if (str.length() >= 2 && "1".equals(str.substring(str.length() - 1))) {
+                        list.add(Integer.parseInt(str.substring(0, str.length() - 1)));
+                    }
                 }
             }
         }

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

@@ -491,7 +491,9 @@ public class RepairController {
         List<FileVo> fileVoList = new ArrayList<>();
         //更新维修单和送修单
         repairBill.setRepairStatus(4);
-        repairBill.setRepairUserB(userPublicService.getOne(repairReceiveVo.getReceiveUserbId()).getName());
+        if (repairReceiveVo.getReceiveUserbId()!=null) {
+            repairBill.setRepairUserB(userPublicService.getOne(repairReceiveVo.getReceiveUserbId()).getName());
+        }
         if (repairReceiveVo.getStartUserbId()!=null){
             repairSendBill.setStartUserbId(repairReceiveVo.getStartUserbId());
             repairSendBill.setAgent(userPublicService.getOne(repairReceiveVo.getStartUserbId()).getName());
@@ -595,6 +597,7 @@ public class RepairController {
             taskService.moveToArchive(taskBto);
         }
         else {
+            RepairBill repairBill = deviceRepairBillService.getOne(taskBto.getBillId());
             RepairSendBill repairSendBill = deviceRepairSendBillDao.findByDeviceRepairBillId(taskBto.getBillId());
             List<Integer> ids = userPublicService.findOtherUser(userId);
             ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(repairSendBill.getSendUnit())).stream()
@@ -614,6 +617,21 @@ public class RepairController {
                 });
                 repairSendBill.setReceiveFiles(FilesUtil.stringFileToList(fileUploadVo.getReceiveFiles()));
             }
+            if (fileUploadVo.getStartUserbId()!=null){
+                String s = userPublicService.getOne(fileUploadVo.getStartUserbId()).getName();
+                repairBill.setStartUserB(s);
+                repairSendBill.setStartUserbId(fileUploadVo.getStartUserbId());
+                repairSendBill.setAgent(s);
+                MessageBto messageBto1 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为签发人", Collections.singletonList(fileUploadVo.getStartUserbId()), 1);
+                messageService.add(messageBto1);
+            }
+            if (fileUploadVo.getRepairUserbId()!=null){
+                repairSendBill.setRepairUserbId(fileUploadVo.getRepairUserbId());
+                repairBill.setRepairUserB(userPublicService.getOne(fileUploadVo.getRepairUserbId()).getName());
+                MessageBto messageBto2 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getRepairUserbId()), 1);
+                messageService.add(messageBto2);
+            }
+            deviceRepairBillService.update(repairBill);
             deviceRepairSendBillService.update(repairSendBill);
             //添加装备日志
             List<Integer> deviceIds = StringSplitUtil.split(repairSendBill.getRepairDeviceCheckDetail());
@@ -1670,6 +1688,14 @@ public class RepairController {
             //保存账单
             repairSendBill.setSendFiles(FilesUtil.stringFileToList(fileVo.getSendFiles()));
             List<Integer> idList = new ArrayList<>();
+            if (fileVo.getStartUserbId()!=null){
+                String startUserB = userPublicService.getOne(fileVo.getStartUserbId()).getName();
+                repairBill.setStartUserB(startUserB);
+                repairSendBill.setStartUserbId(fileVo.getStartUserbId());
+                repairSendBill.setAgent(startUserB);
+                MessageBto messageBto1 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为签发人", Collections.singletonList(fileVo.getStartUserbId()), 1);
+                messageService.add(messageBto1);
+            }
             if (fileVo.getReceiveUseraId()!=null) {
                 repairBill.setRepairUserA(userPublicService.getOne(fileVo.getReceiveUseraId()).getName());
                 repairSendBill.setRepairUseraId(fileVo.getReceiveUseraId());

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/FileUploadVo.java

@@ -35,4 +35,10 @@ public class FileUploadVo {
 
     @ApiModelProperty(value = "接收方配发单")
     private List<FileRet> receiveFiles;
+
+    @ApiModelProperty(value = "接收单位B岗")
+    private Integer startUserbId;
+
+    @ApiModelProperty(value = "接收单位B岗")
+    private Integer repairUserbId;
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/FileVo.java

@@ -33,4 +33,7 @@ public class FileVo {
 
     @ApiModelProperty(value = "接收单位B岗")
     private Integer receiveUserbId;
+
+    @ApiModelProperty(value = "发件单位B岗")
+    private Integer startUserbId;
 }

dev-task/src/main/java/com/tykj/dev/device/task/subject/vo/BusinessTypeVo.java

+package com.tykj.dev.device.task.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@AllArgsConstructor
+@ApiModel("业务类型返回类")
+public class BusinessTypeVo {
+
+    private Integer businessType;
+
+    @ApiModelProperty(value = "业务类型名称")
+    private String businessTypeName;
+
+}