[清退] 提交了清退签发人添加接口

dev-sendback/src/main/java/com/tykj/dev/device/sendback/controller/RepelDevController.java

@@ -178,6 +178,16 @@ public class RepelDevController {
         return ResponseEntity.ok("上传回执单成功");
     }
 
+    /**
+     * 清退出入库发件方选择签发人接口
+     */
+    @ApiOperation(value = "清退出入库发件方选择签发人接口", notes = "上传回执单 也可以不上传回执单")
+    @PostMapping(value ="/addSendBUser")
+    public ResponseEntity addSendBUser( @RequestBody StorageDeviceRepel storageDeviceRepel){
+        repelBusinessService.addSendBUser(storageDeviceRepel);
+        return ResponseEntity.ok("签发人选择成功");
+    }
+
     /**
      * 测试
      */

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepelDetail.java

@@ -113,7 +113,7 @@ public class DeviceRepelDetail extends BaseEntity {
      * 签发人
      */
     @ApiModelProperty(value = "签发人(B岗位)")
-    private String sendUserbId;
+    private Integer sendUserbId;
     /**
      * 收件方 经办人
      */

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelBusinessService.java

@@ -113,4 +113,8 @@ public interface RepelBusinessService {
      */
     void receipts(StorageDeviceRepel storageDeviceRepel);
 
+    /**
+     * 添加发件签发人员信息
+     */
+    void addSendBUser(StorageDeviceRepel storageDeviceRepel);
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -714,13 +714,25 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
     public void receipts(StorageDeviceRepel storageDeviceRepel) {
        TaskBto taskBto = taskService.get(storageDeviceRepel.getTaskId());
        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1214);
-
        taskService.moveToEnd(taskBto);
        DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
+       deviceRepelDetail.setSenderUserB(storageDeviceRepel.getUserBName());
+       deviceRepelDetail.setSendUserbId(storageDeviceRepel.getUserB());
        deviceRepelDetail.setOutboundFile(FilesUtil.stringFileToList(storageDeviceRepel.getOutFiles()));
        deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
     }
 
+    @Override
+    public void addSendBUser(StorageDeviceRepel storageDeviceRepel) {
+        TaskBto taskBto = taskService.get(storageDeviceRepel.getTaskId());
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1214);
+        DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
+        deviceRepelDetail.setSenderUserB(storageDeviceRepel.getUserBName());
+        deviceRepelDetail.setSendUserbId(storageDeviceRepel.getUserB());
+        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"选择了你为签发人请阅知",new ArrayList<>(storageDeviceRepel.getUserB())));
+        deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
+    }
+
 
     /**
      * 生成区清退任务

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -142,6 +142,9 @@ public class UserServiceImpl implements UserService {
         if (userOptional.isPresent()){
             User user1= userOptional.get();
             user.setNoPassword(user1.getNoPassword());
+            user.setShowOrder(user1.getShowOrder());
+            user.setTrainStatus(user1.getTrainStatus());
+            user.setIsDel(user1.getIsDel());
         }else {
          throw new ApiException(ResponseEntity.status(500).body("没找到对应的用户id"));
         }