[销毁 报废] bug修改

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/controller/DecommissioningDevController.java

@@ -50,9 +50,9 @@ public class DecommissioningDevController {
      * 出库把任务推送至盖章审核
      */
     @ApiOperation(value = "出库把任务推送至盖章审核", notes = "出库把任务推送至盖章审核")
-    @PostMapping(value ="/sealOfAudit/{userId}/{taskId}")
-    public ResponseEntity sealOfAudit(@PathVariable Integer userId, @RequestBody DecommissioningOrderOutData orderOutData, @PathVariable Integer taskId){
-        deviceDecommissioningBusinessService.sealOfAudit(taskId,userId,orderOutData);
+    @PostMapping(value ="/sealOfAudit/{userId}")
+    public ResponseEntity sealOfAudit(@PathVariable Integer userId, @RequestBody DecommissioningOrderOutData orderOutData){
+        deviceDecommissioningBusinessService.sealOfAudit(userId,orderOutData);
         return ResponseEntity.ok("退役任务保存草稿成功");
     }
 

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/DeviceDecommissioningBusinessService.java

@@ -37,7 +37,7 @@ public interface DeviceDecommissioningBusinessService {
     /**
      * 出库把任务推送至盖章审核
      */
-    void sealOfAudit(Integer taskId,Integer userId,DecommissioningOrderOutData orderOutData);
+    void sealOfAudit(Integer userId,DecommissioningOrderOutData orderOutData);
 
     /**
      * 出库盖章审核调用

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java

@@ -93,10 +93,12 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
                 }
         );
         if (decommissioningOrderOutData.getTaskId()==null){
-            DeviceDecommissioningDetail deviceDestroyBill1=deviceDecommissioningDetailService.findApplyId(decommissioningOrderOutData.getApplyId());
-            if (deviceDestroyBill1!=null){
+            if (decommissioningOrderOutData.getApplyId()!=null) {
+                DeviceDecommissioningDetail deviceDestroyBill1 = deviceDecommissioningDetailService.findApplyId(decommissioningOrderOutData.getApplyId());
+                if (deviceDestroyBill1 != null) {
                     deviceDecommissioningDetail.setId(deviceDestroyBill1.getId());
                 }
+            }
             deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
             deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
             taskBto= sendDraftTask(units.getUnitId(), deviceDecommissioningDetail.getId(),userId);
@@ -106,6 +108,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
             DeviceDecommissioningDetail  deviceDecommissioningDetail1 = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
             deviceDecommissioningDetail.setId(deviceDecommissioningDetail1.getId());
         }
+        deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getReplyFileList()));
+        deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getApplyFileList()));
         deviceDecommissioningDetail.setScripts(decommissioningOrderOutData.getScriptSaveVos());
         deviceDecommissioningDetail.setScriptJson(JacksonUtil.toJSon(decommissioningOrderOutData.getScriptSaveVos()));
         deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
@@ -147,6 +151,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
                 addMessage(new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "发起退役任务,待上传回执单据", gainThisUser(user.getUserId(), user.getUnitsId())));
                 deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
             }
+        deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getReplyFileList()));
+        deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getApplyFileList()));
             deviceDecommissioningDetail.setDeviceIds(StringUtils.ListToString(decommissioningOrderOutData.getDevIds()));
             deviceDecommissioningDetail.setOutboundFile(FilesUtil.stringFileToList(decommissioningOrderOutData.getOutboundFileList()));
             deviceDecommissioningDetail.setScripts(decommissioningOrderOutData.getScriptSaveVos());
@@ -202,22 +208,24 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
     }
 
     @Override
-    public void sealOfAudit(Integer taskId, Integer userId, DecommissioningOrderOutData orderOutData) {
+    public void sealOfAudit(Integer userId, DecommissioningOrderOutData orderOutData) {
         DeviceDecommissioningDetail deviceDecommissioningDetail =new DeviceDecommissioningDetail();
         User user = userService.findByUser(orderOutData.getSendUserbId());
         Units units=unitsService.findById(user.getUnitsId());
-        if (taskId==null){
+        if (orderOutData.getTaskId()==null){
              deviceDecommissioningDetail = orderOutData.toDeviceDecommissioningDetail();
              deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
              sealOfAuditTask(units.getUnitId(), deviceDecommissioningDetail.getId(),orderOutData.getSendUserbId());
         }else {
-            TaskBto taskBto = taskService.get(taskId);
+            TaskBto taskBto = taskService.get(orderOutData.getTaskId());
             List<StatusEnum> statusEnums = new ArrayList<>();
             statusEnums.add(StatusEnum.DECOMMISSIONING_1250);
             TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
             deviceDecommissioningDetail = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
             taskService.moveToSpecial(taskBto, StatusEnum.DECOMMISSIONING_1251, orderOutData.getSendUserbId());
         }
+        deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(orderOutData.getReplyFileList()));
+        deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(orderOutData.getApplyFileList()));
         deviceDecommissioningDetail.setScriptJson(JacksonUtil.toJSon(orderOutData.getScriptSaveVos()));
         deviceDecommissioningDetail.setScripts(orderOutData.getScriptSaveVos());
         deviceDecommissioningDetail.setSenderUserB(user.getName());

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningDetailServiceImpl.java

@@ -9,6 +9,7 @@ import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import com.tykj.dev.misc.exception.ApiException;
+import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -55,6 +56,17 @@ public class DeviceDecommissioningDetailServiceImpl implements DeviceDecommissio
             deviceDecommissioningDetail.setBillFiles(FilesUtil.stringFileToList(deviceDecommissioningDetail.getBillFile()));
             deviceDecommissioningDetail.setOutboundFiles(FilesUtil.stringFileToList(deviceDecommissioningDetail.getOutboundFile()));
             deviceDecommissioningDetail.setInFiles(FilesUtil.stringFileToList(deviceDecommissioningDetail.getInFile()));
+            deviceDecommissioningDetail.setReplyFileList(FilesUtil.stringFileToList(deviceDecommissioningDetail.getReplyFiles()));
+            deviceDecommissioningDetail.setApplyFileList(FilesUtil.stringFileToList(deviceDecommissioningDetail.getApplyFiles()));
+            List<String> seqNumbers=new ArrayList<>();
+            JacksonUtil.readValue(deviceDecommissioningDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
+                    scriptSaveVo -> {
+                        if (scriptSaveVo.getSeqNumber()!=null){
+                            seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
+                        }
+                    }
+            );
+            deviceDecommissioningDetail.setDeviceLibraryEntities(deviceLibraryDao.findAllBySeqNumberIn(seqNumbers).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList()));
             return deviceDecommissioningDetail;
         }else {
             log.info("[退役] 详情查看错误，id没有找到{}",decommissioningId);

dev-destroy/src/main/java/com/tykj/dev/device/destroy/entity/domain/DeviceDestroyBill.java

 package com.tykj.dev.device.destroy.entity.domain;
 
 import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import com.tykj.dev.misc.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -97,6 +98,10 @@ public class DeviceDestroyBill extends BaseEntity {
     @Transient
     private List<FileRet> replayFileList;
 
+    @Transient
+    @ApiModelProperty(value = "装备List")
+    private List<DeviceLibrary> deviceLibraryEntities =new ArrayList<>();
+
     @ApiModelProperty(value = "销毁文件集合")
     @Transient
     private List<FileRet> destructionFileList;

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBillServiceImpl.java

@@ -7,19 +7,24 @@ import com.tykj.dev.device.destroy.repository.DeviceDestroyBillDao;
 import com.tykj.dev.device.destroy.service.DeviceDestroyBillService;
 import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.file.service.FilesUtil;
+import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
+import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
 import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.misc.exception.ApiException;
+import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 
 /**
@@ -44,6 +49,9 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
     @Autowired
     private BlockChainUtil blockChainUtil;
 
+    @Autowired
+    DeviceLibraryDao deviceLibraryDao;
+
 
     @Override
     public DeviceDestroyBill saveDeviceDestroyBill(DeviceDestroyBill scrap) {
@@ -60,6 +68,15 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
             deviceDestroyBill.setDestructionFileList(FilesUtil.stringFileToList(deviceDestroyBill.getDestructionFiles()));
             deviceDestroyBill.setReplayFileList(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFiles()));
             deviceDestroyBill.setUnitName(unitsService.findById(deviceDestroyBill.getUnitId()).getName());
+            List<String> seqNumbers=new ArrayList<>();
+            JacksonUtil.readValue(deviceDestroyBill.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
+                    scriptSaveVo -> {
+                        if (scriptSaveVo.getSeqNumber()!=null){
+                            seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
+                        }
+                    }
+            );
+            deviceDestroyBill.setDeviceLibraryEntities(deviceLibraryDao.findAllBySeqNumberIn(seqNumbers).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList()));
             return deviceDestroyBill;
         }else {
             log.info("[销毁] 详情查看错误，id没有找到{}",scrapId);

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBusinessServiceImpl.java

@@ -75,10 +75,12 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
         deviceDestroyBill.setReplayFiles(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFileList()));
         deviceDestroyBill.setScriptJson(JacksonUtil.toJSon(deviceDestroyBill.getScripts()));
         if (deviceDestroyBillVo.getTaskId()==null){
-            Optional<DeviceDestroyBill> deviceDestroyBill1=deviceDestroyBillService.findApplyId(deviceDestroyBillVo.getApplyId());
-            if (deviceDestroyBill1.isPresent()){
+            if (deviceDestroyBillVo.getApplyId()!=null) {
+                Optional<DeviceDestroyBill> deviceDestroyBill1 = deviceDestroyBillService.findApplyId(deviceDestroyBillVo.getApplyId());
+                if (deviceDestroyBill1.isPresent()) {
                     deviceDestroyBill.setId(deviceDestroyBill1.get().getId());
                 }
+            }
             deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
             deviceDestroyBill.setNum("NO:第" + LocalDateTime.now().getYear() + "XF" + deviceDestroyBill.getId());
             taskBto= sendDraftTask(securityUser.getCurrentUserInfo().getUnitsId(),deviceDestroyBill.getId(),securityUser.getCurrentUserInfo().getUserId());
@@ -141,8 +143,9 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
         deviceDestroyBill.setDestructionFiles(FilesUtil.stringFileToList(deviceDestroyBillVo.getDestructionFileList()));
         deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
         taskService.moveToEnd(taskBto);
+        deviceLibraryDao.upDateSeqNumbersLeftStatus(DeviceLifeStatus.DESTROYED.id,seqNumbers);
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务补充手续完成",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
-        devLogAdd(seqNumbers,"发了销毁任务,状态转化为销毁中",deviceDestroyBillVo.getOperationId());
+        devLogAdd(seqNumbers,"补充单据信息，状态转化已销毁",deviceDestroyBillVo.getOperationId());
 
     }
 

dev-scrap/src/main/java/com/tykj/dev/device/scrap/controller/ScrapBusinessController.java

@@ -52,9 +52,9 @@ public class ScrapBusinessController {
      * 出库把任务推送至盖章审核
      */
     @ApiOperation(value = "出库把任务推送至盖章审核", notes = "出库把任务推送至盖章审核")
-    @PostMapping(value ="/sealOfAudit/{userId}/{taskId}")
-    public ResponseEntity sealOfAudit(@PathVariable Integer userId, @RequestBody ScrapOrderOutData scrapOrderOutData, @PathVariable Integer taskId){
-        scrapBusinessService.sealOfAudit(taskId,userId,scrapOrderOutData);
+    @PostMapping(value ="/sealOfAudit/{userId}")
+    public ResponseEntity sealOfAudit(@PathVariable Integer userId, @RequestBody ScrapOrderOutData scrapOrderOutData){
+        scrapBusinessService.sealOfAudit(userId,scrapOrderOutData);
         return ResponseEntity.ok("退役任务保存草稿成功");
     }
 

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/ScrapBusinessService.java

@@ -37,7 +37,7 @@ public interface ScrapBusinessService {
     /**
      * 出库把任务推送至盖章审核
      */
-    void sealOfAudit(Integer taskId,Integer userId,ScrapOrderOutData scrapOrderOutData);
+    void sealOfAudit(Integer userId,ScrapOrderOutData scrapOrderOutData);
 
     /**
      * 出库盖章审核调用

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java

@@ -89,10 +89,12 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
         scrap.setDeviceIds(StringUtils.ListToString(scrapOrderOutData.getDevIds()));
         scrap.setOutboundFile(FilesUtil.stringFileToList(scrapOrderOutData.getOutboundFileList()));
         if (scrapOrderOutData.getTaskId()==null) {
-            Optional<Scrap> scrap1=scrapService.findApplyId(scrapOrderOutData.getApplyId());
-            if (scrap1.isPresent()){
+            if (scrapOrderOutData.getApplyId() != null){
+            Optional<Scrap> scrap1 = scrapService.findApplyId(scrapOrderOutData.getApplyId());
+            if (scrap1.isPresent()) {
                 scrap.setId(scrap1.get().getId());
             }
+            }
             scrapService.saveScrap(scrap);
             scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
             taskBto=sendDraftTask(units.getUnitId(), scrap.getId(), userId);
@@ -101,7 +103,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             Scrap scrap1= scrapService.findScrap(taskBto.getBillId());
             scrap.setId(scrap1.getId());
         }
-
+        scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
+        scrap.setApplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getApplyFileList()));
         scrap.setScripts(scrapOrderOutData.getScriptSaveVos());
         scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));
 //        scrap.setDeviceLibraryEntities(findInvoleDevice(scrap.getDeviceIds()));
@@ -144,6 +147,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
         }
         scrap.setDeviceIds(StringUtils.ListToString(scrapOrderOutData.getDevIds()));
         scrap.setOutboundFile(FilesUtil.stringFileToList(scrapOrderOutData.getOutboundFileList()));
+        scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
+        scrap.setApplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getApplyFileList()));
         scrap.setScripts(scrapOrderOutData.getScriptSaveVos());
         scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));
         scrapService.saveScrap(scrap);
@@ -195,22 +200,24 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
     }
 
     @Override
-    public void sealOfAudit(Integer taskId, Integer userId, ScrapOrderOutData scrapOrderOutData) {
+    public void sealOfAudit(Integer userId, ScrapOrderOutData scrapOrderOutData) {
         Scrap scrap =new Scrap();
         User user = userService.findByUser(scrapOrderOutData.getSendUserbId());
         Units units=unitsService.findById(user.getUnitsId());
-        if (taskId==null){
+        if (scrapOrderOutData.getTaskId()==null){
             scrap = scrapOrderOutData.toScrap();
             scrapService.saveScrap(scrap);
-            sealOfAuditTask(units.getUnitId(), scrap.getId(),userId);
+            sealOfAuditTask(units.getUnitId(), scrap.getId(),user.getUserId());
         }else {
-            TaskBto taskBto = taskService.get(taskId);
+            TaskBto taskBto = taskService.get(scrapOrderOutData.getTaskId());
             List<StatusEnum> statusEnums = new ArrayList<>();
             statusEnums.add(StatusEnum.SCRAP_2223);
             TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
             scrap = scrapService.findScrap(taskBto.getBillId());
-            taskService.moveToSpecial(taskBto, StatusEnum.SCRAP_2225, userId);
+            taskService.moveToSpecial(taskBto, StatusEnum.SCRAP_2224, user.getUserId());
         }
+        scrap.setReplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getReplyFileList()));
+        scrap.setApplyFiles(FilesUtil.stringFileToList(scrapOrderOutData.getApplyFileList()));
         scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));
         scrap.setScripts(scrapOrderOutData.getScriptSaveVos());
         scrap.setSenderUserB(user.getName());
@@ -244,7 +251,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
     private TaskBto sealOfAuditTask(Integer unitId, Integer repelDetailId,Integer userId){
         List<Integer> list=new ArrayList<>();
         list.add(userId);
-        return taskService.start(new TaskBto(StatusEnum.SCRAP_2224.id, "报废任务", null, ".", repelDetailId, BusinessEnum.DECOMMISSIONING.id, unitId, 0, "", list));
+        return taskService.start(new TaskBto(StatusEnum.SCRAP_2224.id, "报废任务", null, ".", repelDetailId, BusinessEnum.SCRAP.id, unitId, 0, "", list));
     }
 
     /**

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapServiceImpl.java

@@ -13,6 +13,7 @@ import com.tykj.dev.device.scrap.subject.domin.Scrap;
 import com.tykj.dev.device.scrap.subject.domin.ScrapBill;
 import com.tykj.dev.device.scrap.subject.vo.ScrapSelectVo;
 import com.tykj.dev.misc.exception.ApiException;
+import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,17 @@ public class ScrapServiceImpl implements ScrapService {
             scrap.setScripts(JacksonUtil.readValue(scrap.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}));
             scrap.setBillFiles(FilesUtil.stringFileToList(scrap.getBillFile()));
             scrap.setOutboundFiles(FilesUtil.stringFileToList(scrap.getOutboundFile()));
+            scrap.setReplyFileList(FilesUtil.stringFileToList(scrap.getReplyFiles()));
+            scrap.setApplyFileList(FilesUtil.stringFileToList(scrap.getApplyFiles()));
+            List<String> seqNumbers=new ArrayList<>();
+            JacksonUtil.readValue(scrap.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
+                    scriptSaveVo -> {
+                        if (scriptSaveVo.getSeqNumber()!=null){
+                            seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
+                        }
+                    }
+            );
+            scrap.setDeviceLibraryEntities(deviceLibraryDao.findAllBySeqNumberIn(seqNumbers).stream().map(DeviceLibrary::setConfigName).collect(Collectors.toList()));
             return scrap;
         }else {
             log.info("[报废] 详情查看错误，id没有找到{}",scrapId);

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

 package com.tykj.dev.device.sendback.controller;
 
 import com.tykj.dev.config.swagger.AutoDocument;
-import com.tykj.dev.device.sendback.entity.vo.DeviceIdLIstVo;
-import com.tykj.dev.device.sendback.entity.vo.ModelAndTypeVo;
-import com.tykj.dev.device.sendback.entity.vo.RepelManagementVo;
-import com.tykj.dev.device.sendback.entity.vo.SendBackOutFormVo;
+import com.tykj.dev.device.sendback.entity.vo.*;
 import com.tykj.dev.device.sendback.service.AgainStorageBillService;
 import com.tykj.dev.device.sendback.service.RepelQueryService;
 import com.tykj.dev.device.task.service.TaskService;
@@ -67,16 +64,16 @@ public class RepelQueryController {
         return ResponseEntity.ok(repelQueryService.findDeviceRepel(taskId));
     }
 
-    @PostMapping(value ="/deviceChooseRepel/{unitId}/{taskId}")
+    @PostMapping(value ="/deviceChooseRepel")
     @ApiOperation(value = "代办任务通知页面详情", notes = "代办任务通知页面详情")
-    public ResponseEntity findDeviceRepel(@RequestBody List<Integer> fielding, @PathVariable Integer unitId, @PathVariable Integer taskId){
-        return ResponseEntity.ok(repelQueryService.findDeviceChooseRepel(fielding,unitId,taskId));
+    public ResponseEntity findDeviceRepel(@RequestBody DeviceChoosePageVo deviceChoosePageVo){
+        return ResponseEntity.ok(repelQueryService.findDeviceChooseRepel(deviceChoosePageVo));
     }
 
-    @PostMapping(value ="/deviceChooseRepel1/{unitId}")
+    @PostMapping(value ="/deviceChooseRepel1")
     @ApiOperation(value = "省本级任务清退装备查询接口", notes = "省本级任务清退装备查询接口")
-    public ResponseEntity findDeviceRepel1(@RequestBody List<Integer>  fielding, @PathVariable Integer unitId){
-        return ResponseEntity.ok(repelQueryService.findDeviceChooseRepel1(fielding,unitId));
+    public ResponseEntity findDeviceRepel1(@RequestBody DeviceChoosePageVo deviceChoosePageVo){
+        return ResponseEntity.ok(repelQueryService.findDeviceChooseRepel1(deviceChoosePageVo));
     }
 
     @GetMapping(value ="/deviceSendOut/{taskId}")

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DeviceChoosePageVo.java

+package com.tykj.dev.device.sendback.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceChoosePageVo.java
+ * @Description TODO
+ * @createTime 2021年04月14日 15:01:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("选择装备查询分页vo")
+public class DeviceChoosePageVo {
+    @ApiModelProperty(value = "在库查询条件")
+    private DeviceSelectVo deviceSelectVos;
+
+    @ApiModelProperty(value = "异常查询条件")
+    private DeviceSelectVo deviceSelectVoAbnormal;
+
+    @ApiModelProperty(value = "列装集合id")
+    private List<Integer> fielding;
+
+    @ApiModelProperty(value = "单位id")
+    private Integer unitId;
+
+    @ApiModelProperty(value = "任务id")
+    private Integer taskId;
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DeviceChooseRepel.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -21,9 +22,9 @@ import java.util.List;
 @ApiModel("选择选择页面")
 public class DeviceChooseRepel {
 
-    private List<DeviceLibrary> deviceLibraries;
+    private Page<DeviceLibrary> deviceLibraries;
 
-    private List<DeviceLibrary> deviceLibrariesAbnormal;
+    private Page<DeviceLibrary> deviceLibrariesAbnormal;
 
     /**
      * 是否可以提交 1。可以 0。不可以 用于判读市下级任务是否都完成了

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DeviceSelectVo.java

+package com.tykj.dev.device.sendback.entity.vo;
+
+import com.tykj.dev.misc.base.CustomPage;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName DeviceSelectVo.java
+ * @Description TODO
+ * @createTime 2021年04月14日 15:02:00
+ */
+public class DeviceSelectVo extends CustomPage {
+}

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

@@ -33,7 +33,7 @@ public interface RepelQueryService {
     /**
      * 根据列装id,以及当前用户
      */
-    DeviceChooseRepel findDeviceChooseRepel(List<Integer> fielding,Integer unitId,Integer taskId);
+    DeviceChooseRepel findDeviceChooseRepel(DeviceChoosePageVo deviceChoosePageVo);
 
 
     /**
@@ -81,7 +81,7 @@ public interface RepelQueryService {
 
 
 //    /**
-//     * 查询直属单位
+//     * 根据任务taskId查询任务涉及直属单位的相关装备
 //     */
 //    List<DirectlyUnderNavigation> directlyUnderUnitLeftNavigation(Integer taskId);
 
@@ -106,7 +106,7 @@ public interface RepelQueryService {
     /**
      * 省自己装备清退列表查询的接口
      */
-    DeviceChooseRepel findDeviceChooseRepel1(List<Integer> fielding,Integer unitId);
+    DeviceChooseRepel findDeviceChooseRepel1(DeviceChoosePageVo deviceChoosePageVo);
 
 
 

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

@@ -21,6 +21,7 @@ import com.tykj.dev.misc.base.DeviceLifeStatus;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
+import com.tykj.dev.misc.utils.PageUtil;
 import com.tykj.dev.misc.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,7 +79,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public DeviceRepel findDeviceRepel(Integer taskId) {
         TaskBto taskBto= taskService.get(taskId);
-        if (taskBto.getBusinessType()== BusinessEnum.SEND_BACK_STATISTICAL.id){
+        if (taskBto.getBusinessType().equals(BusinessEnum.SEND_BACK_STATISTICAL.id)){
             return deviceRepelService.findDeviceRepel(taskBto.getBillId());
         }
         DeviceRepelDetail deviceRepelDetail = repelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
@@ -86,15 +87,15 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     }
 
     @Override
-    public  DeviceChooseRepel findDeviceChooseRepel(List<Integer> fielding, Integer unitId,Integer taskId) {
+    public  DeviceChooseRepel findDeviceChooseRepel(DeviceChoosePageVo deviceChoosePageVo) {
         List<DeviceLibrary> deviceLibraries=new ArrayList<>();
         List<DeviceLibrary> deviceLibrariesAbnormal=new ArrayList<>();
-        Units units= unitsService.findById(unitId);
+        Units units= unitsService.findById(deviceChoosePageVo.getUnitId());
 
-        DeviceRepelDetail deviceRepelDetail= repelDetailService.findDeviceRepelDetail(taskService.get(taskId).getBillId());
+        DeviceRepelDetail deviceRepelDetail= repelDetailService.findDeviceRepelDetail(taskService.get(deviceChoosePageVo.getTaskId()).getBillId());
         DeviceRepel deviceRepel=deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
         if (deviceRepel.getSeqNumbers()==null||deviceRepel.getSeqNumbers().equals("")) {
-            deviceLibraryDao.findAllByPackingIdInAndOwnUnit(fielding, units.getName()).stream()
+            deviceLibraryDao.findAllByPackingIdInAndOwnUnit(deviceChoosePageVo.getFielding(), units.getName()).stream()
                     .filter(deviceLibrary -> deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_LIBRARY.id)
                             || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPEL.id)
                             || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.SEND_BACK.id)
@@ -139,14 +140,27 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         }
         int isNotSub = 1;
         if (units.getLevel()==2) {
-            TaskBto taskBto = taskService.findFatherIdAndCustomInfo(taskId);
+            TaskBto taskBto = taskService.findFatherIdAndCustomInfo(deviceChoosePageVo.getTaskId());
             if (!taskBto.getBillStatus().equals(StatusEnum.END.id)) {
                 isNotSub = 0;
             }
         }
-        return new DeviceChooseRepel(deviceLibraries,deviceLibrariesAbnormal,isNotSub);
+        Page<DeviceLibrary> deviceLibraryPage= PageUtil.getPerPage(deviceChoosePageVo.getDeviceSelectVos().getPage(), deviceChoosePageVo.getDeviceSelectVos().getSize(), deviceLibraries, deviceChoosePageVo.getDeviceSelectVos().getPageable());
+        Page<DeviceLibrary> deviceLibraryPageAbnormal= PageUtil.getPerPage(deviceChoosePageVo.getDeviceSelectVoAbnormal().getPage(), deviceChoosePageVo.getDeviceSelectVoAbnormal().getSize(), deviceLibraries, deviceChoosePageVo.getDeviceSelectVoAbnormal().getPageable());
+
+        return new DeviceChooseRepel(deviceLibraryPage,deviceLibraryPageAbnormal,isNotSub);
     }
 
+
+//    private PredicateBuilder<DeviceLibrary> getPredicateBuilderDeviceChooseRepel(List<Integer> packingList,List<Integer> lifeStatusList) {
+//        PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
+//        predicateBuilder.in("packingId",packingList);
+//        predicateBuilder.in("lifeStatus",lifeStatusList);
+//        return predicateBuilder;
+//    }
+
+
+
     @Override
     public List<DeviceLibrary> findDeviceSendOut(Integer taskId) {
         TaskBto taskBto = taskService.get(taskId);
@@ -296,11 +310,11 @@ public class RepelQueryServiceImpl implements RepelQueryService {
 
 
     @Override
-    public DeviceChooseRepel findDeviceChooseRepel1(List<Integer> fielding, Integer unitId) {
+    public DeviceChooseRepel findDeviceChooseRepel1(DeviceChoosePageVo deviceChoosePageVo) {
         List<DeviceLibrary> deviceLibraries=new ArrayList<>();
         List<DeviceLibrary> deviceLibrariesAbnormal=new ArrayList<>();
-        Units units= unitsService.findById(unitId);
-        deviceLibraryDao.findAllByPackingIdInAndOwnUnit(fielding,units.getName()).stream()
+        Units units= unitsService.findById(deviceChoosePageVo.getUnitId());
+        deviceLibraryDao.findAllByPackingIdInAndOwnUnit(deviceChoosePageVo.getFielding(),units.getName()).stream()
                 .filter(deviceLibrary -> deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_LIBRARY.id)
                         ||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPAIRING.id)
                         ||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_TRANSIT.id)
@@ -318,7 +332,9 @@ public class RepelQueryServiceImpl implements RepelQueryService {
                     }
                 }
         );
-        return new DeviceChooseRepel(deviceLibraries,deviceLibrariesAbnormal,1);
+        Page<DeviceLibrary> deviceLibraryPage= PageUtil.getPerPage(deviceChoosePageVo.getDeviceSelectVos().getPage(), deviceChoosePageVo.getDeviceSelectVos().getSize(), deviceLibraries, deviceChoosePageVo.getDeviceSelectVos().getPageable());
+        Page<DeviceLibrary> deviceLibraryPageAbnormal= PageUtil.getPerPage(deviceChoosePageVo.getDeviceSelectVoAbnormal().getPage(), deviceChoosePageVo.getDeviceSelectVoAbnormal().getSize(), deviceLibraries, deviceChoosePageVo.getDeviceSelectVoAbnormal().getPageable());
+        return new DeviceChooseRepel(deviceLibraryPage,deviceLibraryPageAbnormal,1);
     }
 
     private DevRepelVo devRepelVo(DeviceLibrary deviceLibrary){

dev-train/src/main/java/com/tykj/dev/device/train/controller/HandoverController.java

@@ -88,7 +88,6 @@ public class HandoverController {
     @GetMapping(value = "/userList")
     @ApiOperation(value = "工作交接-查询交接人下拉")
     public ResponseEntity userList(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
-
         return ResponseEntity.ok(userService.findByUniteId1(securityUser.getCurrentUserInfo().getUnitsId()).stream().filter(userShenRe -> userShenRe.getTrainStatus()!=5).collect(Collectors.toList()));
     }
 

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/WorkHandoverAddVo.java

@@ -27,6 +27,15 @@ public class WorkHandoverAddVo {
      */
     private List<Integer> turnOverUserAId;
 
+    /**
+     * 监交人
+     */
+    private String inUserName;
+
+    /**
+     * 上级领导
+     */
+    private String leadershipName;
 
     /**
      * 单据装备数据统计数据

dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/WorkHandoverEndAddVo.java

@@ -24,6 +24,16 @@ public class WorkHandoverEndAddVo {
      */
     private Integer workHandoverId;
 
+    /**
+     * 监交人
+     */
+    private String inUserName;
+
+    /**
+     * 上级领导
+     */
+    private String leadershipName;
+
     /**
      * 文件集合(装备列表签字文件集合)
      */

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java

@@ -72,6 +72,12 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
         List<User> users= userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId());
         List<Integer> handoverIds= users.stream().filter(user -> user.getTrainStatus()!=5).map(User::getUserId).collect(Collectors.toList());
         WorkHandover workHandover=new WorkHandover();
+        if (workHandoverAddVo.getInUserName()!=null) {
+            workHandover.setInUserName(workHandoverAddVo.getInUserName());
+        }
+        if (workHandoverAddVo.getLeadershipName()!=null) {
+            workHandover.setLeadershipName(workHandoverAddVo.getLeadershipName());
+        }
         workHandover.setStatus(1);
         workHandover.setTurnOverUserIds(StringSplitUtil.ListToString(workHandoverAddVo.getTurnOverUserAId()));
         workHandover.setHandoverUserIds(StringSplitUtil.ListToString(handoverIds));
@@ -103,6 +109,8 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
             log.info("[WorkHandover] 未找到id：{} 工作交接业务", workHandoverEndAddVo.getWorkHandoverId());
             throw new ApiException(ResponseEntity.status(500).body("未找到id为" + workHandoverEndAddVo.getWorkHandoverId() + " 工作交接业务"));
         }
+        workHandover.setInUserName(workHandoverEndAddVo.getInUserName());
+        workHandover.setLeadershipName(workHandoverEndAddVo.getLeadershipName());
         workHandover.setStatus(2);
         workHandover.setFile(FilesUtil.stringFileToList(workHandoverEndAddVo.getFileLists()));
         workHandover = workHandoverDao.save(workHandover);