更新

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

@@ -157,7 +157,7 @@ public class AllotBillController {
         Long signId2 = snowflake.creatNextId();
         allotBillEntity.setLeftSignatureId(signId.toString());
         allotBillEntity.setRightSignatureId(signId2.toString());
-        allotBillService.update(allotBillEntity);
+        AllotBill allotBill = allotBillService.update(allotBillEntity);
         Integer billId = allotBillEntity.getId();
         Integer userId = userUtils.getCurrentUserId();
         String deviceIdDetail = allotBillEntity.getAllotCheckDetail();
@@ -176,7 +176,7 @@ public class AllotBillController {
                 taskBto.setOwnUnit(userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()));
                 saveEntity = taskService.moveToSpecial(taskBto, StatusEnum.ALLOTING, 0);
             }
-            TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_FILE.id, "配发单据", saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 0, null, userIds);
+            TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_ALLOT_FILE.id, "配发业务", saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 3, userPublicService.findUnitIdByName(allotBillEntity.getSendUnit()), 0, null, userIds);
             taskService.start(taskBto2);
         }
         else {
@@ -220,7 +220,7 @@ public class AllotBillController {
         messageService.add(messageBto);
         log.info("[配发模块]:" + allotBillEntity.getSendUnit() + "对" + allotBillEntity.getReceiveUnit() + "发起配发");
         myWebSocket.sendMessage1();
-        return ResponseEntity.ok(new ResultObj(saveEntity, "发起成功"));
+        return ResponseEntity.ok(new ResultObj(allotBill, "发起成功"));
     }
 
     @ApiOperation(value = "配发审核", notes = "可以通过这个接口对配发审核")

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBackBillServiceImpl.java

@@ -38,10 +38,11 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(allotBackBill1.getId())));
+            AllotBackBill allotBackBill2 = getOne(allotBackBill1.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(allotBackBill2));
             String recordId = bcText.getData().getRecordID();
-            allotBackBill1.setRecordId(recordId);
-            allotBackBillDao.save(allotBackBill1);
+            allotBackBill2.setRecordId(recordId);
+            allotBackBillDao.save(allotBackBill2);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return allotBackBill1;
     }

dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBillServiceImpl.java

@@ -48,10 +48,11 @@ public class AllotBillServiceImpl implements AllotBillService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(allotBill.getId())));
+            AllotBill allotBill1 = getOne(allotBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(allotBill1));
             String recordId = bcText.getData().getRecordID();
-            allotBill.setRecordId(recordId);
-            allotBillDao.save(allotBill);
+            allotBill1.setRecordId(recordId);
+            allotBillDao.save(allotBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return allotBill;
     }

dev-apply/src/main/java/com/tykj/dev/device/apply/service/impl/DeviceApplyBillServiceImpl.java

@@ -36,10 +36,11 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceApplyBill));
+            DeviceApplyBill deviceApplyBill1 = getOne(deviceApplyBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceApplyBill1));
             String recordId = bcText.getData().getRecordID();
-            deviceApplyBill.setRecordId(recordId);
-            deviceApplyBillDao.save(deviceApplyBill);
+            deviceApplyBill1.setRecordId(recordId);
+            deviceApplyBillDao.save(deviceApplyBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return deviceApplyBill;
     }

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -102,7 +102,7 @@ public enum LogType {
 
     REPAIR_BACK_5(41,REPAIR_BACK.id, ORIGIN_STATUS.id, WAIT_UPLOAD_BACK_FILE.id, "维修退回装备接收并发起入库(缺失单据)"),
 
-    REPAIR_BACK_6(42,REPAIR_BACK.id, REPAIR_BACK_RECEIVE_CONFIRM.id, ARCHIVE.id, "维修退回装备入库审核失败"),
+    REPAIR_BACK_6(42,REPAIR_BACK.id, WAIT_UPLOAD_BACK_SEND_FILE.id, ARCHIVE.id, "取消上传领取单"),
 
     RETIRED_1(43,RETIRED.id, ORIGIN_STATUS.id, RETIRED_BUSINESS_NEED_CONFIRM.id, "发起退装"),
 
@@ -220,6 +220,7 @@ public enum LogType {
     SELF_CHECK_5(92,SELF_CHECK.id, ORIGIN_STATUS.id, END.id, "终端自查"),
     SELF_CHECK_6(93,SELF_CHECK.id, WAIT_SELF_CHECK.id, END.id, "周期自查"),
     APPLY_4(94,APPLY.id, ORIGIN_STATUS.id, END.id, "发起装备申请"),
+    REPAIR_BACK_8(95,REPAIR_BACK.id, WAIT_UPLOAD_BACK_SEND_FILE.id, END.id, "上传领取单"),
     ;
 
     public Integer id;

dev-destroy/src/main/java/com/tykj/dev/device/destroy/controller/DeviceDestroyController.java

@@ -87,6 +87,7 @@ public class DeviceDestroyController {
     @PostMapping(value = "/form")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity selectRepairBill(@Validated @RequestBody DeviceDestroyFormVo formVo) throws ParseException {
+        deviceLibraryService.isWaitRetired(formVo.getDevices());
         //生成销毁账单
         User currentUserInfo = AuthenticationUtils.getAuthentication().getCurrentUserInfo();
         DeviceDestroyBill destroyBill = DeviceDestroyBill.formVoToBill(formVo, currentUserInfo);

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

@@ -52,10 +52,11 @@ public class DeviceDestroyBillServiceImpl implements DeviceDestroyBillService {
     public DeviceDestroyBill addEntity(DeviceDestroyBill deviceDestroyBillEntity) {
         DeviceDestroyBill deviceDestroyBill = deviceDestroyBillDao.save(deviceDestroyBillEntity);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceDestroyBill));
+            DeviceDestroyBill deviceDestroyBill1 = getOne(deviceDestroyBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceDestroyBill1));
             String recordId = bcText.getData().getRecordID();
-            deviceDestroyBill.setRecordId(recordId);
-            deviceDestroyBillDao.save(deviceDestroyBill);
+            deviceDestroyBill1.setRecordId(recordId);
+            deviceDestroyBillDao.save(deviceDestroyBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return deviceDestroyBill;
     }

dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java

@@ -133,4 +133,9 @@ public interface DeviceLibraryService {
      * 判断装备状态是否在库或待退役
      */
     void isInStockOrWaitRetired(List<Integer> ids);
+
+    /**
+     * 判断装备状态是否在库或维修中
+     */
+    void isInStockOrRepairing(List<Integer> ids);
 }

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -54,10 +54,11 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     public DeviceLibrary addEntity(DeviceLibrary deviceLibraryEntity) {
         DeviceLibrary deviceLibrary = deviceLibraryDao.save(deviceLibraryEntity);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceLibrary));
+            DeviceLibrary deviceLibrary1 = getOne(deviceLibrary.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceLibrary1));
             String recordId = bcText.getData().getRecordID();
-            deviceLibrary.setRecordId(recordId);
-            deviceLibraryDao.save(deviceLibrary);
+            deviceLibrary1.setRecordId(recordId);
+            deviceLibraryDao.save(deviceLibrary1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return deviceLibrary;
     }
@@ -401,7 +402,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     /**
      * 判断装备状态是否待退役
      *
-     * @param ids
+     * @param ids 装备id集合
      */
     @Override
     public void isWaitRetired(List<Integer> ids) {
@@ -416,7 +417,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     /**
      * 判断装备状态是否在库或待退役
      *
-     * @param ids
+     * @param ids 装备id集合
      */
     @Override
     public void isInStockOrWaitRetired(List<Integer> ids) {
@@ -428,6 +429,21 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         });
     }
 
+    /**
+     * 判断装备状态是否在库或维修中
+     *
+     * @param ids 装备id集合
+     */
+    @Override
+    public void isInStockOrRepairing(List<Integer> ids) {
+        ids.forEach(integer -> {
+            DeviceLibrary deviceLibrary = getOne(integer);
+            if (deviceLibrary.getLifeStatus()!=2&&deviceLibrary.getLifeStatus()!=4){
+                throw new ApiException(ResponseEntity.status(303).body("序列号"+deviceLibrary.getSeqNumber()+"的装备已被其他专管员操作"));
+            }
+        });
+    }
+
     @Override
     public List<DeviceLibrary> getAllList(DeviceLibrarySelectVo deviceLibrarySelectVo) {
         return deviceLibraryDao.findAll(getSelectSpecification4(deviceLibrarySelectVo));

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLogServiceImpl.java

@@ -35,10 +35,11 @@ public class DeviceLogServiceImpl implements DeviceLogService {
     public void addLog(DeviceLogDto deviceLogDto) {
         DeviceLog deviceLog = deviceLogDao.save(deviceLogDto.toDo());
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceLog));
+            DeviceLog deviceLog1 = deviceLogDao.findById(deviceLog.getId()).get();
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceLog1));
             String recordId = bcText.getData().getRecordID();
-            deviceLog.setRecordId(recordId);
-            deviceLogDao.save(deviceLog);
+            deviceLog1.setRecordId(recordId);
+            deviceLogDao.save(deviceLog1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
     }
 

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DeviceVo.java

@@ -15,6 +15,8 @@ public class DeviceVo {
 
     private Integer isPart;
 
+    private Integer lockStatus;
+
     /**
      * 型号
      */

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceBillServiceImpl.java

@@ -36,10 +36,11 @@ public class MatchingDeviceBillServiceImpl implements MatchingDeviceBillService
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(matchingDeviceBill.getId())));
+            MatchingDeviceBill matchingDeviceBill1 = getOne(matchingDeviceBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(matchingDeviceBill1));
             String recordId = bcText.getData().getRecordID();
-            matchingDeviceBill.setRecordId(recordId);
-            matchingDeviceBillDao.save(matchingDeviceBill);
+            matchingDeviceBill1.setRecordId(recordId);
+            matchingDeviceBillDao.save(matchingDeviceBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return matchingDeviceBill;
     }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceLibraryServiceImpl.java

@@ -49,10 +49,11 @@ public class MatchingDeviceLibraryServiceImpl implements MatchingDeviceLibrarySe
     public MatchingDeviceLibrary addEntity(MatchingDeviceLibrary matchingDeviceLibraryEntity) {
         MatchingDeviceLibrary matchingDeviceLibrary = matchingDeviceLibraryDao.save(matchingDeviceLibraryEntity);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(matchingDeviceLibrary));
+            MatchingDeviceLibrary matchingDeviceLibrary1 = getOne(matchingDeviceLibrary.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(matchingDeviceLibrary1));
             String recordId = bcText.getData().getRecordID();
-            matchingDeviceLibrary.setRecordId(recordId);
-            matchingDeviceLibraryDao.save(matchingDeviceLibrary);
+            matchingDeviceLibrary1.setRecordId(recordId);
+            matchingDeviceLibraryDao.save(matchingDeviceLibrary1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return matchingDeviceLibrary;
     }

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -213,6 +213,7 @@ public enum StatusEnum {
     REPAIR_RECEIVE_CONFIRM(702, "接收维修装备待审核"),
     REPAIRING(703, "维修中"),
     WAIT_UPLOAD_FILE(704, "等待上传送修单"),
+    WAIT_UPLOAD_SEND_FILE(722, "等待上传送修单"),
     COUNTRY_REPAIRING(777, "等待接收维修退回装备"),
     /**
      * 维修完成退回状态
@@ -221,6 +222,7 @@ public enum StatusEnum {
     WAIT_BACK_RECEIVE(801, "等待接收维修退回装备"),
     REPAIR_BACK_RECEIVE_CONFIRM(802, "接收维修退回装备待审核"),
     WAIT_UPLOAD_BACK_FILE(804, "等待上传回执单"),
+    WAIT_UPLOAD_BACK_SEND_FILE(810, "等待上传领取单"),
 
     /**
      * 配发退回状态

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -163,6 +163,7 @@ public class PackingController {
             PackingLibrary packingLibrary2 = packingLibraries1.get(i-1);
             if (packingLibrary2.getId().equals(packingLibrary1.getId())){
                 packingLibrary2.setShowOrder(i);
+                packingLibraryService.update(packingLibrary2);
                 order = i;
                 break;
             }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java

@@ -97,4 +97,9 @@ public interface PackingLibraryService {
      * 通过id逻辑删除该列装以及所有子列装
      */
     void deleteAll(Integer id);
+
+    /**
+     * 设置顺序的排序
+     */
+    List<PackingLibrary> setOrder(List<PackingLibrary> packingLibraries);
 }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -53,10 +53,11 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
+            PackingLibrary packingLibrary1 = getOne(packingLibrary.getId());
             BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(packingLibrary.getId())));
             String recordId = bcText.getData().getRecordID();
-            packingLibrary.setRecordId(recordId);
-            packingLibraryDao.save(packingLibrary);
+            packingLibrary1.setRecordId(recordId);
+            packingLibraryDao.save(packingLibrary1);
         });
         return packingLibrary;
     }
@@ -196,7 +197,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         //返回父子结构
         Map<Integer, PackingLibrary> nodeCollect =
                 packingLibraryEntities.stream().collect(Collectors.toMap(PackingLibrary::getId, packingLibrary -> packingLibrary));
-        return GetTreeUtils.parseTreeFromDown(
+        return setOrder(GetTreeUtils.parseTreeFromDown(
                 packingLibraryEntities,
                 PackingLibrary::getId,
                 packingLibrary -> Optional.ofNullable(nodeCollect.get(packingLibrary.getPartParentId())),
@@ -211,7 +212,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
                     || GlobalMap.getDeviceInvisibleRangeMap().get(packingLibrary.getInvisibleRange()).name.contains(content)
                     || GlobalMap.getDeviceSecretLevelMap().get(packingLibrary.getSecretLevel()).name.contains(content);
             return isSameModel && isSameName && isSameStatus && isSameSecretLevel && isContainContent;
-        }).sorted(Comparator.comparing(PackingLibrary::getShowOrder,Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList());
+        }).sorted(Comparator.comparing(PackingLibrary::getShowOrder,Comparator.nullsLast(Integer::compareTo))).collect(Collectors.toList()));
     }
 
     /**
@@ -237,6 +238,20 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         }
     }
 
+    /**
+     * 设置顺序的排序
+     */
+    @Override
+    public List<PackingLibrary> setOrder(List<PackingLibrary> packingLibraries) {
+        List<PackingLibrary> packingLibraryList = new ArrayList<>();
+        for (int i =1;i<=packingLibraries.size();i++){
+            PackingLibrary packingLibrary = packingLibraries.get(i-1);
+            packingLibrary.setShowOrder(i);
+            packingLibraryList.add(update(packingLibrary));
+        }
+        return packingLibraryList;
+    }
+
     private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
         Integer level = userUtils.getCurrentUnitLevel();

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

@@ -2,6 +2,7 @@ package com.tykj.dev.device.repair.controller;
 
 import com.tykj.dev.config.GlobalMap;
 import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.service.DeviceChangeService;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
@@ -133,6 +134,21 @@ public class RepairController {
     @PostMapping(value = "/form")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity createRepair(@RequestBody @Validated RepairBillSaveVo repairBillSaveVo) {
+        deviceLibraryService.isInStockOrRepairing(StringSplitUtil.split(repairBillSaveVo.getRepairDeviceCheckDetail()));
+        List<Integer> detailIds = new ArrayList<>();
+        repairBillSaveVo.getDeviceList().forEach(deviceDetailVo -> {
+            if (deviceDetailVo.getId()!=null){
+                detailIds.add(deviceDetailVo.getId());
+            }
+        });
+        if (detailIds.size()>0){
+            detailIds.forEach(integer -> {
+                RepairDetail repairDetail = deviceRepairDetailService.getOne(integer);
+                if (repairDetail.getRepairStatus()!=1){
+                    throw new ApiException(ResponseEntity.status(303).body("序列号"+repairDetail.getSeqNumber()+"的装备已被其他专管员操作"));
+                }
+            });
+        }
         Integer level = userUtils.getCurrentUnitLevel();
         //添加维修单和送修单
         RepairBill repairBill = new RepairBill();
@@ -164,7 +180,7 @@ public class RepairController {
         Calendar calendar = Calendar.getInstance();
         String s1 = "NO:第" + calendar.get(Calendar.YEAR) + "WX" + repairBill1.getId() + "号";
         repairBill1.setDocNum(s1);
-        deviceRepairBillService.update(repairBill1);
+        RepairBill repairBill2 = deviceRepairBillService.update(repairBill1);
         //发起维修业务
         List<Integer> userIds = new ArrayList<>();
         userIds.add(userId);
@@ -288,7 +304,7 @@ public class RepairController {
         MessageBto messageBto = new MessageBto(saveEntity.getId(),saveEntity.getBusinessType(),"向"+userPublicService.getAreaNameByUnitName(repairBill.getReceiveUnit())+"发起装备维修",ids);
         messageService.add(messageBto);
         myWebSocket.sendMessage1();
-        return ResultUtil.success(saveEntity);
+        return ResultUtil.success(repairBill2);
     }
 
     @ApiOperation(value = "继续向上发起维修", notes = "可以通过这个接口继续向上发起维修")
@@ -652,6 +668,20 @@ public class RepairController {
     @PostMapping(value = "/back")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity repairBack(@RequestBody @Validated RepairBackBillSaveVo repairBackBillSaveVo) {
+        List<Integer> detailIds = new ArrayList<>();
+        repairBackBillSaveVo.getDeviceList().forEach(deviceDetailVo -> {
+            if (deviceDetailVo.getId()!=null){
+                detailIds.add(deviceDetailVo.getId());
+            }
+        });
+        if (detailIds.size()>0){
+            detailIds.forEach(integer -> {
+                RepairDetail repairDetail = deviceRepairDetailService.getOne(integer);
+                if (repairDetail.getRepairStatus()!=1){
+                    throw new ApiException(ResponseEntity.status(303).body("序列号"+repairDetail.getSeqNumber()+"的装备已被其他专管员操作"));
+                }
+            });
+        }
         //获取当前维修业务，维修单
 //        TaskBto taskBto = taskService.get(repairBackBillSaveVo.getTaskId());
         Integer userId = userUtils.getCurrentUserId();
@@ -673,13 +703,15 @@ public class RepairController {
         Calendar calendar = Calendar.getInstance();
         String s1 = "NO:第" + calendar.get(Calendar.YEAR) + "LQ" + repairBackBill.getId() + "号";
         deviceRepairBackBillEntity1.setDocNum(s1);
-        deviceRepairBackBillService.update(deviceRepairBackBillEntity1);
+        RepairBackBill repairBackBill1 = deviceRepairBackBillService.update(deviceRepairBackBillEntity1);
         //发起维修退回子业务
         List<Integer> userIds = new ArrayList<>();
         userIds.add(userId);
         userIds.add(0);
         TaskBto taskBto1 = new TaskBto(StatusEnum.WAIT_BACK_RECEIVE.id, "维修退回", null,  ".", deviceRepairBackBillEntity1.getId(), BusinessEnum.REPAIR_BACK.id,userPublicService.findUnitIdByName(repairBackBill.getReceiveUnit()), 1, null, userIds);
         TaskBto task = taskService.start(taskBto1);
+        TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_SEND_FILE.id, "维修退回", task.getId(), task.getNodeIdDetail() + task.getId() + ".", task.getBillId(), BusinessEnum.REPAIR_BACK.id, userPublicService.findUnitIdByName(repairBackBill.getSendUnit()), 0, null, userIds);
+        taskService.start(taskBto2);
         //添加业务日志
         List<FileVo> fileVoList = new ArrayList<>();
 //        fileVoList.add(new FileVo("出库确认单", repairBackBillSaveVo.getFileName(), repairBackBillSaveVo.getFileUrl()));
@@ -729,7 +761,7 @@ public class RepairController {
         MessageBto messageBto = new MessageBto(task.getId(),task.getBusinessType(),"向"+userPublicService.getAreaNameByUnitName(repairBackBill.getReceiveUnit())+"退回维修装备",ids);
         messageService.add(messageBto);
         myWebSocket.sendMessage1();
-        return ResultUtil.success(task);
+        return ResultUtil.success(repairBackBill1);
     }
 
     @ApiOperation(value = "修好装备出库审核", notes = "可以通过这个接口修好装备出库审核")
@@ -1555,6 +1587,38 @@ public class RepairController {
         return ResultUtil.success("更新成功");
     }
 
+    @ApiOperation(value = "上传领取单", notes = "上传领取单")
+    @PostMapping(value = "/uploadFile")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity uploadFile(@RequestBody @Validated com.tykj.dev.device.repair.subject.vo.FileVo fileVo){
+        //获取task
+        TaskBto taskBto = taskService.get(fileVo.getTaskId());
+        List<StatusEnum> statusEnums = new ArrayList<>();
+        statusEnums.add(StatusEnum.WAIT_UPLOAD_BACK_SEND_FILE);
+        TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
+        //不上传单据
+        if (fileVo.getStatus()==0){
+            taskService.moveToArchive(taskBto);
+        }
+        else {
+            RepairBackBill repairBackBill = deviceRepairBackBillService.getOne(taskBto.getBillId());
+            //保存账单
+            repairBackBill.setSendFiles(FilesUtil.stringFileToList(fileVo.getSendFiles()));
+            deviceRepairBackBillService.update(repairBackBill);
+            List<Integer> ids = StringSplitUtil.split(repairBackBill.getBackCheckDetail());
+            //业务完结
+            taskService.moveToEnd(taskBto);
+            //装备日志
+            List<FileVo> fileVoList = new ArrayList<>();
+            fileVo.getSendFiles().forEach(fileRet -> fileVoList.add(new FileVo("领取单", fileRet.getName(), fileRet.getPreviewPath())));
+            ids.forEach(integer -> {
+                DeviceLogDto deviceLogDto = new DeviceLogDto(integer, "上传领取单", fileVoList);
+                deviceLogService.addLog(deviceLogDto);
+            });
+        }
+        return ResponseEntity.ok("OK");
+    }
+
     /**
      * @param repairBillId 维修单id
      * @return 维修详情列表

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java

@@ -41,10 +41,11 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(repairBackBill.getId())));
+            RepairBackBill repairBackBill1 = getOne(repairBackBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(repairBackBill1));
             String recordId = bcText.getData().getRecordID();
-            repairBackBill.setRecordId(recordId);
-            deviceRepairBackBillDao.save(repairBackBill);
+            repairBackBill1.setRecordId(recordId);
+            deviceRepairBackBillDao.save(repairBackBill1);
         });
         return repairBackBill;
     }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBillServiceImpl.java

@@ -48,10 +48,11 @@ public class RepairBillServiceImpl implements RepairBillService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(repairBill.getId())));
+            RepairBill repairBill1 = getOne(repairBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(repairBill1));
             String recordId = bcText.getData().getRecordID();
-            repairBill.setRecordId(recordId);
-            deviceRepairBillDao.save(repairBill);
+            repairBill1.setRecordId(recordId);
+            deviceRepairBillDao.save(repairBill1);
         },TaskBeanConfig.getThreadPoolTaskScheduler());
         return repairBill;
     }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairDetailServiceImpl.java

@@ -36,10 +36,11 @@ public class RepairDetailServiceImpl implements RepairDetailService {
     public RepairDetail save(RepairDetail deviceRepairDetailEntity) {
         RepairDetail repairDetail = deviceRepairDetailDao.save(deviceRepairDetailEntity);
         CompletableFuture.runAsync(()->{
+            RepairDetail repairDetail1 = getOne(repairDetail.getId());
             BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(repairDetail.getId())));
             String recordId = bcText.getData().getRecordID();
-            repairDetail.setRecordId(recordId);
-            deviceRepairDetailDao.save(repairDetail);
+            repairDetail1.setRecordId(recordId);
+            deviceRepairDetailDao.save(repairDetail1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return repairDetail;
     }

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairSendBillServiceImpl.java

@@ -43,10 +43,11 @@ public class RepairSendBillServiceImpl implements RepairSendBillService {
     public RepairSendBill addEntity(RepairSendBill deviceRepairSendBillEntity) {
         RepairSendBill repairSendBill = deviceRepairSendBillDao.save(deviceRepairSendBillEntity);
         CompletableFuture.runAsync(()->{
+            RepairSendBill repairSendBill1 = getOne(repairSendBill.getId());
             BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(repairSendBill.getId())));
             String recordId = bcText.getData().getRecordID();
-            repairSendBill.setRecordId(recordId);
-            deviceRepairSendBillDao.save(repairSendBill);
+            repairSendBill1.setRecordId(recordId);
+            deviceRepairSendBillDao.save(repairSendBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return repairSendBill;
     }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairBackBill.java

@@ -233,4 +233,7 @@ public class RepairBackBill {
 
     @ApiModelProperty(value = "区块链记录id")
     private String recordId;
+
+    @Column(name = "send_files",columnDefinition = "TEXT")
+    private String sendFiles;
 }

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

+package com.tykj.dev.device.repair.subject.vo;
+
+import com.tykj.dev.device.file.entity.FileRet;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("上传领取单据类")
+public class FileVo {
+
+    @NotNull(message = "taskId不能为空")
+    @Min(value = 1,message = "taskId不能小于1")
+    @ApiModelProperty(value = "任务Id")
+    private Integer taskId;
+
+    @ApiModelProperty(value = "领取单附件")
+    private List<FileRet> sendFiles;
+
+    @NotNull(message = "status不能为空")
+    @ApiModelProperty(value = "是否上传单据（0：否，1：是）")
+    private Integer status;
+}

dev-retired/src/main/java/com/tykj/dev/device/retired/service/Impl/DeviceRetiredBillServiceImpl.java

@@ -41,10 +41,11 @@ public class DeviceRetiredBillServiceImpl implements DeviceRetiredBillService {
     public DeviceRetiredBill addEntity(DeviceRetiredBill deviceRetiredBillEntity) {
         DeviceRetiredBill deviceRetiredBill = deviceRetiredBillDao.save(deviceRetiredBillEntity);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(deviceRetiredBill.getId())));
+            DeviceRetiredBill deviceRetiredBill1 = getOne(deviceRetiredBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceRetiredBill1));
             String recordId = bcText.getData().getRecordID();
-            deviceRetiredBill.setRecordId(recordId);
-            deviceRetiredBillDao.save(deviceRetiredBill);
+            deviceRetiredBill1.setRecordId(recordId);
+            deviceRetiredBillDao.save(deviceRetiredBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return deviceRetiredBill;
     }

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/AccessControlNameServiceImpl.java

@@ -29,10 +29,11 @@ public class AccessControlNameServiceImpl implements AccessControlNameService {
     public AccessControlName add(AccessControlName accessControlName) {
         AccessControlName accessControlName1 = accessControlNameDao.save(accessControlName);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(accessControlName1));
+            AccessControlName accessControlName2 = accessControlNameDao.findById(accessControlName1.getId()).get();
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(accessControlName2));
             String recordId = bcText.getData().getRecordID();
-            accessControlName1.setRecordId(recordId);
-            accessControlNameDao.save(accessControlName1);
+            accessControlName2.setRecordId(recordId);
+            accessControlNameDao.save(accessControlName2);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return accessControlName1;
     }

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/InputOutputDeviceServiceImpl.java

@@ -39,10 +39,11 @@ public class InputOutputDeviceServiceImpl implements InputOutputDeviceService {
     public void addEntity(InputOutputDevice inputOutputDevice) {
         InputOutputDevice inputOutputDevice1 = inputOutputDeviceDao.save(inputOutputDevice);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(inputOutputDevice1));
+            InputOutputDevice inputOutputDevice2 = inputOutputDeviceDao.findById(inputOutputDevice1.getId()).get();
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(inputOutputDevice2));
             String recordId = bcText.getData().getRecordID();
-            inputOutputDevice1.setRecordId(recordId);
-            inputOutputDeviceDao.save(inputOutputDevice1);
+            inputOutputDevice2.setRecordId(recordId);
+            inputOutputDeviceDao.save(inputOutputDevice2);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
     }
 

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/LibraryWarningLogDetailServiceImp.java

@@ -33,10 +33,11 @@ public class LibraryWarningLogDetailServiceImp implements LibraryWarningLogDetai
     public LibraryWarningLogDetail addEntity(LibraryWarningLogDetail libraryWarningLogDetail) {
         LibraryWarningLogDetail libraryWarningLogDetail1 = libraryWarningLogDetailDao.save(libraryWarningLogDetail);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(libraryWarningLogDetail1));
+            LibraryWarningLogDetail libraryWarningLogDetail2 = libraryWarningLogDetailDao.findById(libraryWarningLogDetail1.getId()).get();
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(libraryWarningLogDetail2));
             String recordId = bcText.getData().getRecordID();
-            libraryWarningLogDetail1.setRecordId(recordId);
-            libraryWarningLogDetailDao.save(libraryWarningLogDetail1);
+            libraryWarningLogDetail2.setRecordId(recordId);
+            libraryWarningLogDetailDao.save(libraryWarningLogDetail2);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return libraryWarningLogDetail1;
     }

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/LibraryWarningLogServiceImpl.java

@@ -61,10 +61,11 @@ public class LibraryWarningLogServiceImpl implements LibraryWarningLogService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(libraryWarningLog1.getId())));
+            LibraryWarningLog libraryWarningLog2 = getOne(libraryWarningLog1.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(libraryWarningLog2));
             String recordId = bcText.getData().getRecordID();
-            libraryWarningLog1.setRecordId(recordId);
-            libraryWarningLogDao.save(libraryWarningLog1);
+            libraryWarningLog2.setRecordId(recordId);
+            libraryWarningLogDao.save(libraryWarningLog2);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return libraryWarningLog1;
     }

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/RfidChangeBillServiceImpl.java

@@ -37,10 +37,11 @@ public class RfidChangeBillServiceImpl implements RfidChangeBillService {
     public RfidChangeBill addEntity(RfidChangeBill libraryWarningLogEntity) {
         RfidChangeBill rfidChangeBill = rfidChangeBillDao.save(libraryWarningLogEntity);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(rfidChangeBill.getId())));
+            RfidChangeBill rfidChangeBill1 = getOne(rfidChangeBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(rfidChangeBill1));
             String recordId = bcText.getData().getRecordID();
-            rfidChangeBill.setRecordId(recordId);
-            rfidChangeBillDao.save(rfidChangeBill);
+            rfidChangeBill1.setRecordId(recordId);
+            rfidChangeBillDao.save(rfidChangeBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return rfidChangeBill;
     }

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/RfidChangeLogServiceImpl.java

@@ -48,10 +48,11 @@ public class RfidChangeLogServiceImpl implements RfidChangeLogService {
     public RfidChangeLog addEntity(RfidChangeLog rfidChangeLog) {
         RfidChangeLog rfidChangeLog1 = rfidChangeLogDao.save(rfidChangeLog);
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(rfidChangeLog1.getId())));
+            RfidChangeLog rfidChangeLog2 = getOne(rfidChangeLog1.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(rfidChangeLog2));
             String recordId = bcText.getData().getRecordID();
-            rfidChangeLog1.setRecordId(recordId);
-            rfidChangeLogDao.save(rfidChangeLog1);
+            rfidChangeLog2.setRecordId(recordId);
+            rfidChangeLogDao.save(rfidChangeLog2);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return rfidChangeLog1;
     }

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

@@ -76,6 +76,7 @@ public class DeviceScrapController {
     @PostMapping(value = "/form")
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity commitScrap(@RequestBody @Validated ScrapSaveVo scrapSaveVo) {
+        deviceLibraryService.isWaitRetired(scrapSaveVo.getDeviceIds());
         //转实体类
         ScrapBill scrapBill = scrapSaveVo.toDo();
         //计算所有不同的型号

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

@@ -44,10 +44,11 @@ public class ScrapBillServiceImpl implements ScrapBillService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(scrapBill1.getId())));
+            ScrapBill scrapBill2 = getOne(scrapBill1.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(scrapBill2));
             String recordId = bcText.getData().getRecordID();
-            scrapBill1.setRecordId(recordId);
-            scrapBillDao.save(scrapBill1);
+            scrapBill2.setRecordId(recordId);
+            scrapBillDao.save(scrapBill2);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return scrapBill1;
     }

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/service/impl/SelfCheckBillServiceImpl.java

@@ -50,10 +50,11 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(selfCheckBill.getId())));
+            SelfCheckBill selfCheckBill1 = getOne(selfCheckBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(selfCheckBill1));
             String recordId = bcText.getData().getRecordID();
-            selfCheckBill.setRecordId(recordId);
-            selfExaminationBillDao.save(selfCheckBill);
+            selfCheckBill1.setRecordId(recordId);
+            selfExaminationBillDao.save(selfCheckBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return selfCheckBill;
     }

dev-storage/src/main/java/com/tykj/dev/device/storage/service/impl/StorageBillServiceImpl.java

@@ -38,10 +38,11 @@ public class StorageBillServiceImpl implements StorageBillService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(getOne(storageBill.getId())));
+            StorageBill storageBill1 = getOne(storageBill.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(storageBill1));
             String recordId = bcText.getData().getRecordID();
-            storageBill.setRecordId(recordId);
-            storageBillDao.save(storageBill);
+            storageBill1.setRecordId(recordId);
+            storageBillDao.save(storageBill1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return storageBill;
     }

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskLogServiceImpl.java

@@ -46,10 +46,11 @@ public class TaskLogServiceImpl implements TaskLogService {
     public void addLog(TaskLogBto taskLogBto) {
         TaskLog taskLog = taskLogDao.save(taskLogBto.toDo());
         CompletableFuture.runAsync(() ->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(taskLog));
+            TaskLog taskLog1 = taskLogDao.findById(taskLog.getId()).get();
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(taskLog1));
             String recordId = bcText.getData().getRecordID();
-            taskLog.setRecordId(recordId);
-            taskLogDao.save(taskLog);
+            taskLog1.setRecordId(recordId);
+            taskLogDao.save(taskLog1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
     }
 

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -292,10 +292,11 @@ public class TaskServiceImpl implements TaskService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(taskDao.findById(task.getId()).get()));
+            Task task1 = taskDao.findById(task.getId()).get();
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(task1));
             String recordId = bcText.getData().getRecordID();
-            task.setRecordId(recordId);
-            taskDao.save(task);
+            task1.setRecordId(recordId);
+            taskDao.save(task1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return task.parse2Bto();
     }
@@ -736,17 +737,17 @@ public class TaskServiceImpl implements TaskService {
             }
             //set跟踪时间
             if (type == 1) {
-                Date userTime = getUserTime(taskUserVo.getId());
-                if (userTime == null) {
-                    taskUserVo.setUserTime("0天0小时");
-                    taskUserVo.setUserTimeDate(new Date(0));
-                } else {
-                    long time = System.currentTimeMillis() - userTime.getTime();
+//                Date userTime = getUserTime(taskUserVo.getId());
+//                if (userTime == null) {
+//                    taskUserVo.setUserTime("0天0小时");
+//                    taskUserVo.setUserTimeDate(new Date(0));
+//                } else {
+                long time = System.currentTimeMillis() - taskUserVo.getCreateTime().getTime();
                 int day = new Long(time / 86_400_000).intValue();
                 int hour = new Long((time % 86_400_000) / 3_600_000).intValue();
                 taskUserVo.setUserTime(day + "天" + hour + "小时");
                 taskUserVo.setUserTimeDate(new Date(time));
-                }
+//                }
             }
         });
         return list;

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

@@ -70,10 +70,11 @@ public class TrainThemeServiceImpl implements TrainThemeService {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(findById(trainTheme1.getTrainId())));
+            TrainTheme trainTheme2 = findById(trainTheme1.getTrainId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(trainTheme2));
             String recordId = bcText.getData().getRecordID();
-            trainTheme1.setRecordId(recordId);
-            trainThemeDao.save(trainTheme1);
+            trainTheme2.setRecordId(recordId);
+            trainThemeDao.save(trainTheme2);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
         return trainTheme1;
     }

dev-union/src/main/java/com/tykj/dev/union/LogAspect.java

@@ -391,6 +391,11 @@ public class LogAspect {
                     if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_BACK_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) {
                         this.fileVos.add(new FileVo("回执单", repairBackBill.getBillFileName(), repairBackBill.getBillFileUrl()));
                     }
+                    if ((this.oldStatus.equals(StatusEnum.WAIT_UPLOAD_BACK_SEND_FILE.id) && this.newStatus.equals(StatusEnum.END.id))) {
+                        FilesUtil.stringFileToList(repairBackBill.getSendFiles()).forEach(fileRet -> {
+                            this.fileVos.add(new FileVo("领取单", fileRet.getName(), fileRet.getPreviewPath()));
+                        });
+                    }
                 }
                 break;
             case 13:

dev-user/src/main/java/com/tykj/dev/device/user/read/service/impl/MessageServiceImpl.java

@@ -41,10 +41,11 @@ public class MessageServiceImpl implements MessageService {
     public void add(MessageBto messageBto) {
         Message message = messageDao.save(messageBto.toDo());
         CompletableFuture.runAsync(()->{
-            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(message));
+            Message message1 = get(message.getId());
+            BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(message1));
             String recordId = bcText.getData().getRecordID();
-            message.setRecordId(recordId);
-            messageDao.save(message);
+            message1.setRecordId(recordId);
+            messageDao.save(message1);
         }, TaskBeanConfig.getThreadPoolTaskScheduler());
     }
 

dev-usereport/src/main/java/com/tykj/dev/device/usereport/service/impl/DeviceUseReportServiceImpl.java

@@ -173,7 +173,7 @@ public class DeviceUseReportServiceImpl implements DeviceUseReportService {
         allotStatusList.add(5);
         //筛选出接收配发装备的账单
         List<AllotBill> allotBillEntities = allotBillDao.findAll().stream()
-                .filter(allotBillEntity -> allotBillEntity.getAllotStatus() == 5 && userUtils.getCurrentUserUnitName().equals(userPublicService.findUnitsNameByUserId(allotBillEntity.getReceiveUseraId())) && allotBillEntity.getReceiveTime().after(date) && allotBillEntity.getReceiveTime().before(date2))
+                .filter(allotBillEntity -> allotBillEntity.getAllotStatus() == 5 && userUtils.getCurrentUserUnitName().equals(allotBillEntity.getReceiveUnit()) && allotBillEntity.getReceiveTime().after(date) && allotBillEntity.getReceiveTime().before(date2))
                 .collect(toList());
         //筛选出配发给其它单位的账单
         List<AllotBill> allotBillEntities2 = allotBillDao.findAll().stream()