update

dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java

@@ -119,7 +119,7 @@ public class DeviceApplyController {
     @PostMapping("/addDeviceApplyBill")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity addDeviceApplyBill(@RequestBody @Validated DeviceApplySaveVo deviceApplySaveVo) {
-        //装备申请
+        //不是装备申请
         if (deviceApplySaveVo.getApplyType()!=1) {
             for (ApplyBillDetailVo applyBillDetailVo : GetTreeUtils.splitTree2(deviceApplySaveVo.getStorageBillDetailVoList(),ApplyBillDetailVo::getChilds)) {
                 //判断该装备是否存在装备库
@@ -423,6 +423,7 @@ public class DeviceApplyController {
     public ResponseEntity uploadFile(@RequestBody @Validated UploadApplyFile uploadApplyFile) {
         TaskBto taskBto = taskService.get(uploadApplyFile.getTaskId());
         taskService.addInvolveUser(taskBto, userUtils.getCurrentUserId());
+        //不同意
         if (uploadApplyFile.getStatus()==0){
             taskService.moveToEnd(taskBto);
             List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());

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

@@ -532,6 +532,7 @@ public class RepairController {
         repairBill.setRepairStatus(4);
         if (repairReceiveVo.getReceiveUserbId()!=null) {
             repairBill.setRepairUserB(userPublicService.getOne(repairReceiveVo.getReceiveUserbId()).getName());
+            repairSendBill.setRepairUserbId(repairReceiveVo.getReceiveUserbId());
         }
         if (repairReceiveVo.getStartUserbId()!=null){
             repairSendBill.setStartUserbId(repairReceiveVo.getStartUserbId());
@@ -743,12 +744,10 @@ public class RepairController {
             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);
-//        }
+        if (fileUploadVo.getRepairUserbId()!=null){
+            repairSendBill.setRepairUserbId(fileUploadVo.getRepairUserbId());
+            repairBill.setRepairUserB(userPublicService.getOne(fileUploadVo.getRepairUserbId()).getName());
+        }
         if (fileUploadVo.getRepairUseraId()!=null){
             repairSendBill.setRepairUseraId(fileUploadVo.getRepairUseraId());
             repairBill.setRepairUserA(userPublicService.getOne(fileUploadVo.getRepairUseraId()).getName());