更新

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

@@ -236,7 +236,7 @@ public class AllotBillController {
                             deviceLibraryEntity.setMatchingRange(1);
                         }
 //                        deviceLibraryEntity.setAllotType(2);
-                        DeviceLogDto deviceLogDto = new DeviceLogDto(id, "纵向配发将配发类型由" + deviceLibraryEntity.getMatchingRangeName() + "改为"+configCache.getMatchingRangeMap().get(1), fileVoList);
+                        DeviceLogDto deviceLogDto = new DeviceLogDto(id, "纵向配发将所属列装由" + deviceLibraryEntity.getMatchingRangeName() + "的列装改为"+configCache.getMatchingRangeMap().get(1)+"的列装", fileVoList);
                         deviceLogService.addLog(deviceLogDto);
                     }
                     deviceLibraryEntity.setLifeStatus(3);
@@ -262,7 +262,7 @@ public class AllotBillController {
                             }
                         }
 //                        deviceLibraryEntity.setAllotType(1);
-                        DeviceLogDto deviceLogDto = new DeviceLogDto(id, "横向配发将配发类型由" + deviceLibraryEntity.getMatchingRangeName() + "改为"+configCache.getMatchingRangeMap().get(3), fileVoList);
+                        DeviceLogDto deviceLogDto = new DeviceLogDto(id, "横向配发将所属列装由" + deviceLibraryEntity.getMatchingRangeName() + "的列装改为"+configCache.getMatchingRangeMap().get(3)+"的列装", fileVoList);
                         deviceLogService.addLog(deviceLogDto);
                     }
                     deviceLibraryEntity.setLocationUnit(allotBillSaveVo.getReceiveUnit());

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

@@ -96,7 +96,15 @@ public class BackController {
         if (allotBillSaveVo.getTaskId()==null) {
             a.setSendUseraId(userUtils.getCurrentUserId());
         }
-        AllotBackBill allotBackBill = allotBackBillService.addEntity(a);
+        AllotBackBill allotBackBill;
+        if (allotBillSaveVo.getTaskId()==null){
+            allotBackBill = allotBackBillService.addEntity(a);
+        }
+        else {
+            allotBackBill = allotBackBillService.getOne(taskService.get(allotBillSaveVo.getTaskId()).getBillId());
+            MapperUtils.copyNoNullProperties(a,allotBackBill);
+            allotBackBill = allotBackBillService.update(allotBackBill);
+        }
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         int year = calendar.get(Calendar.YEAR);
@@ -486,7 +494,7 @@ public class BackController {
         AllotBackBill allotBill = allotBackBillService.getOne(taskBto.getBillId());
         if (status==1){
             taskService.moveToSpecial(taskBto,StatusEnum.BACK_WAIT_SIGN);
-            if (allotBill.getBackStatus()==0) {
+            if (allotBill.getBackStatus()==1) {
                 allotBill.setSendUserbId(userUtils.getCurrentUserId());
                 allotBill.setAgent(userUtils.getCurrentName());
             }
@@ -496,7 +504,7 @@ public class BackController {
             allotBackBillService.update(allotBill);
         }
         else {
-            if (allotBill.getBackStatus()==0) {
+            if (allotBill.getBackStatus()==1) {
                 taskService.moveToSpecial(taskBto, StatusEnum.BACK_DRAFT, taskBto.getCreateUserId());
             }
             else {

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

@@ -23,9 +23,8 @@ public interface DeviceApplyBillService {
     DeviceApplyBill getOne(Integer id);
 
     /**
-     * @param applyType 申请类型
      * @param scriptSaveVos 退役/报废/销毁装备单据详情
      */
-    Boolean updateCompleteNum(Integer applyType,List<ScriptSaveVo> scriptSaveVos);
+    void updateCompleteNum(List<ScriptSaveVo> scriptSaveVos);
 
 }

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

 package com.tykj.dev.device.apply.service.impl;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.tykj.dev.blockcha.subject.entity.BcHash;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.TaskBeanConfig;
 import com.tykj.dev.device.apply.repository.DeviceApplyBillDao;
 import com.tykj.dev.device.apply.service.DeviceApplyBillService;
 import com.tykj.dev.device.apply.subject.domin.DeviceApplyBill;
+import com.tykj.dev.device.apply.subject.vo.ReplyVo;
+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.misc.exception.ApiException;
+import com.tykj.dev.device.task.repository.TaskDao;
+import com.tykj.dev.device.task.service.TaskService;
+import com.tykj.dev.device.task.subject.bto.TaskBto;
+import com.tykj.dev.device.task.subject.domin.Task;
+import com.tykj.dev.device.user.read.service.MessageService;
+import com.tykj.dev.device.user.read.subject.bto.MessageBto;
+import com.tykj.dev.device.user.subject.service.UserPublicService;
+import com.tykj.dev.device.user.util.UserUtils;
+import com.tykj.dev.misc.base.StatusEnum;
+import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.groupingBy;
 
 /**
  * @author dengdiyi
@@ -29,6 +45,27 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
     @Autowired
     private BlockChainUtil blockChainUtil;
 
+    @Autowired
+    private TaskDao taskDao;
+
+    @Autowired
+    private DeviceLibraryService deviceLibraryService;
+
+    @Autowired
+    private MessageService messageService;
+
+    @Autowired
+    private TaskService taskService;
+
+    @Autowired
+    private UserPublicService userPublicService;
+
+    @Autowired
+    private UserUtils userUtils;
+
+    @Autowired
+    private DeviceApplyBillService deviceApplyBillService;
+
     @Override
     public DeviceApplyBill addEntity(DeviceApplyBill deviceApplyBillEntity) {
         DeviceApplyBill deviceApplyBill = deviceApplyBillDao.save(deviceApplyBillEntity);
@@ -75,19 +112,60 @@ public class DeviceApplyBillServiceImpl implements DeviceApplyBillService {
     }
 
     @Override
-    public Boolean updateCompleteNum(Integer applyType, List<ScriptSaveVo> scriptSaveVos) {
-
-        if (applyType==2){
-
-        }
-        else if (applyType==3){
-        }
-        else if (applyType==4) {
+    public void updateCompleteNum(List<ScriptSaveVo> scriptSaveVos) {
+        Map<Integer, Task> taskMap = taskDao.findAllByBusinessTypeAndBillStatus(9, StatusEnum.WAIT_CONFIRM_APPLY_DEVICE.id).stream().collect(Collectors.toMap(Task::getId, Function.identity()));
+        Map<Integer, DeviceApplyBill> billMap = deviceApplyBillDao.findAll().stream().collect(Collectors.toMap(DeviceApplyBill::getId,Function.identity()));
+        Map<String, DeviceLibrary> seqMap = deviceLibraryService.getAllDeviceSeqMap();
+        List<DeviceLibrary> deviceLibraries = new ArrayList<>();
+        for (ScriptSaveVo s:scriptSaveVos) {
+            if (s.getSeqNumber()!=null){
+                DeviceSeqUtil.selectDeviceSeqs(s.getSeqNumber()).forEach(s1 -> deviceLibraries.add(seqMap.get(s1)));
+            }
         }
-        else {
-            throw new ApiException("applyType只能为2，3，4");
+        Map<Integer,List<DeviceLibrary>> taskIdMap= deviceLibraries.stream().collect(groupingBy(DeviceLibrary::getApplyTaskId));
+        for (Integer taskId:taskIdMap.keySet()) {
+            Map<Integer,List<DeviceLibrary>> map = taskIdMap.get(taskId).stream().collect(groupingBy(DeviceLibrary::getPackingId));
+            TaskBto taskBto = taskMap.get(taskId).parse2Bto();
+            DeviceApplyBill deviceApplyBill = billMap.get(taskBto.getBillId());
+            Boolean isComplete = true;
+            if (deviceApplyBill.getReplyVos()!=null&&!"".equals(deviceApplyBill.getReplyVos())) {
+                List<ReplyVo> replyVos = JacksonUtil.readValue(deviceApplyBill.getReplyVos(), new TypeReference<List<ReplyVo>>() {
+                });
+                List<DeviceLibrary> deviceLibraryList = new ArrayList<>();
+                if (replyVos != null) {
+                    for(ReplyVo r:replyVos){
+                        if (map.get(r.getId())!=null){
+                            r.setCompleteCount(r.getCompleteCount()+map.get(r.getId()).size());
+                            if (!r.getCompleteCount().equals(r.getNum())){
+                                isComplete = false;
+                                List<String> seqs = DeviceSeqUtil.selectDeviceSeqs(r.getSeqInterval());
+                                seqs.removeAll(map.get(r.getId()).stream().map(DeviceLibrary::getSeqNumber).collect(Collectors.toList()));
+                                seqs.forEach(s -> deviceLibraryList.add(seqMap.get(s)));
+                            }
+                        }
+                    }
+                    if (!isComplete){
+                        Set<Integer> lifeStatus = deviceLibraryList.stream().map(DeviceLibrary::getLifeStatus).collect(Collectors.toSet());
+                        if (lifeStatus.size()==1&&lifeStatus.iterator().next()==11){
+                            isComplete = true;
+                        }
+                    }
+                    if (isComplete){
+                        taskService.moveToEnd(taskBto);
+                        //发送阅知信息
+                        MessageBto messageBto = new MessageBto();
+                        messageBto.setContent("业务办结");
+                        messageBto.setTaskId(taskBto.getId());
+                        messageBto.setIsHighLight(0);
+                        messageBto.setInvolveUserIdList(userPublicService.findOtherUser(userUtils.getCurrentUserId()));
+                        messageBto.setBusinessType(taskBto.getBusinessType());
+                        messageService.add(messageBto);
+                    }
+                    deviceApplyBill.setApplyStat(JacksonUtil.toJSon(replyVos));
+                    deviceApplyBillService.update(deviceApplyBill);
+                }
+            }
         }
-        return null;
     }
 
 }

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -294,9 +294,43 @@ public class DeviceLibraryController {
     @ApiOperation(value = "模糊查询标签管理装备分页", notes = "可以通过这个接口查询装备列表")
     @PostMapping("/selectTagDevicePage")
     public ResponseEntity selectTagDevicePage(@RequestBody DeviceLibrarySelectVo deviceLibrarySelectVo) {
-        Page<DeviceLibrary> deviceLibraryEntities = deviceLibraryService.getTagPage(deviceLibrarySelectVo, deviceLibrarySelectVo.getPageable());
-        deviceLibraryEntities.forEach(DeviceLibrary::setConfigName);
-        return ResultUtil.success(deviceLibraryEntities);
+        Boolean hasModelDim = deviceLibrarySelectVo.getModelDim()!=null;
+        Boolean hasNameDim = deviceLibrarySelectVo.getNameDim()!=null;
+        Boolean hasSeqDim = deviceLibrarySelectVo.getSeqDim()!=null;
+        Boolean hasSurfaceDim = deviceLibrarySelectVo.getSurfaceDim()!=null;
+        Boolean hasLocationUnitDim = deviceLibrarySelectVo.getLocationUnitDim()!=null;
+        Boolean hasOwnUnitDim = deviceLibrarySelectVo.getOwnUnitDim()!=null;
+        Boolean hasLifeStatusDim = deviceLibrarySelectVo.getLifeStatusDim()!=null;
+        Boolean hasUpdateTimeDim = deviceLibrarySelectVo.getUpdateTimeDim()!=null;
+        Boolean hasCreateTimeDim = deviceLibrarySelectVo.getCreateTimeDim()!=null;
+        SimpleDateFormat sdf =  new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
+        List<DeviceLibrary> resultList = deviceLibraryService.getTagPage(deviceLibrarySelectVo, deviceLibrarySelectVo.getPageable());
+        resultList.forEach(DeviceLibrary::setConfigName);
+        if (hasModelDim||hasLifeStatusDim||hasLocationUnitDim||hasNameDim||hasOwnUnitDim||hasSeqDim) {
+            resultList = resultList.stream().filter(deviceLibrary -> {
+                Boolean containModelDim = !hasModelDim||deviceLibrary.getModel().contains(deviceLibrarySelectVo.getModelDim());
+                Boolean containNameDim = !hasNameDim||deviceLibrary.getName().contains(deviceLibrarySelectVo.getNameDim());
+                Boolean containSeqDim = !hasSeqDim||deviceLibrary.getSeqNumber().contains(deviceLibrarySelectVo.getSeqDim());
+                Boolean containSurfaceDim = !hasSurfaceDim||(deviceLibrary.getRfidSurfaceId()!=null&&deviceLibrary.getRfidSurfaceId().contains(deviceLibrarySelectVo.getSurfaceDim()));
+                Boolean containLocationUnitDim = !hasLocationUnitDim||deviceLibrary.getLocationUnit().contains(deviceLibrarySelectVo.getLocationUnitDim());
+                Boolean containOwnUnitDim = !hasOwnUnitDim||deviceLibrary.getOwnUnit().contains(deviceLibrarySelectVo.getOwnUnitDim());
+                Boolean containLifeStatusDim = !hasLifeStatusDim||deviceLibrary.getLifeStatusName().contains(deviceLibrarySelectVo.getLifeStatusDim());
+                Boolean containUpdateTimeDim = !hasUpdateTimeDim||sdf.format(deviceLibrary.getUpdateTime()).contains(deviceLibrarySelectVo.getUpdateTimeDim());
+                Boolean containCreateTimeDim = !hasCreateTimeDim||sdf.format(deviceLibrary.getCreateTime()).contains(deviceLibrarySelectVo.getCreateTimeDim());
+                return containModelDim&&containNameDim&&containSeqDim&&containLocationUnitDim&&containOwnUnitDim&&containLifeStatusDim&&containUpdateTimeDim&&containCreateTimeDim&&containSurfaceDim;
+            }).collect(Collectors.toList());
+        }
+        Page<DeviceLibrary> deviceLibraryEntities = PageUtil.getPerPage(deviceLibrarySelectVo.getPage(), deviceLibrarySelectVo.getSize(), resultList, deviceLibrarySelectVo.getPageable());
+        Map<String,Object> map = new HashMap<>();
+        Map<Integer,String> lifeStatusMap = configCache.getLifeStatusMap();
+        Set<Integer> status = resultList.stream().map(DeviceLibrary::getLifeStatus).collect(Collectors.toSet());
+        map.put("pages",deviceLibraryEntities);
+        map.put("models",resultList.stream().map(DeviceLibrary::getModel).collect(Collectors.toSet()));
+        map.put("names",resultList.stream().map(DeviceLibrary::getName).collect(Collectors.toSet()));
+        map.put("ownUnits",resultList.stream().map(DeviceLibrary::getOwnUnit).collect(Collectors.toSet()));
+        map.put("locationUnits",resultList.stream().map(DeviceLibrary::getLocationUnit).collect(Collectors.toSet()));
+        map.put("lifeStatus",status.stream().map(integer -> new LifeStatusVo(integer,lifeStatusMap.get(integer))).collect(Collectors.toList()));
+        return ResultUtil.success(map);
     }
 
     @ApiOperation(value = "模糊查询核心装备统计分页", notes = "可以通过这个接口查询装备列表")
@@ -370,7 +404,7 @@ public class DeviceLibraryController {
             }
             if (libraryUpdateVo.getLifeStatus() != null && !libraryUpdateVo.getLifeStatus().equals(deviceLibraryEntity.getLifeStatus())) {
                 //添加装备日志
-                String remark = "将装备的生命状态由" + configCache.getLifeStatusMap().get(deviceLibraryEntity.getLifeStatus()) + "改为" + configCache.getLifeStatusMap().get(libraryUpdateVo.getLifeStatus());
+                String remark = "将装备的生命状态由" + configCache.getLifeStatusMap().getOrDefault(deviceLibraryEntity.getLifeStatus(),"空") + "改为" + configCache.getLifeStatusMap().get(libraryUpdateVo.getLifeStatus());
                 DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null);
                 deviceLogService.addLog(deviceLogDto);
                 deviceLibraryEntity.setLifeStatus(libraryUpdateVo.getLifeStatus());
@@ -387,7 +421,7 @@ public class DeviceLibraryController {
             }
             if (libraryUpdateVo.getMatchingRange() != null && !libraryUpdateVo.getMatchingRange().equals(deviceLibraryEntity.getMatchingRange())) {
                 //添加装备日志
-                String remark = "将装备的配用范围由" + configCache.getMatchingRangeMap().get(deviceLibraryEntity.getMatchingRange()) + "改为" + configCache.getMatchingRangeMap().get(libraryUpdateVo.getMatchingRange());
+                String remark = "将装备的配用范围由" + configCache.getMatchingRangeMap().getOrDefault(deviceLibraryEntity.getMatchingRange(),"空") + "改为" + configCache.getMatchingRangeMap().get(libraryUpdateVo.getMatchingRange());
                 DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null);
                 deviceLogService.addLog(deviceLogDto);
                 deviceLibraryEntity.setMatchingRange(libraryUpdateVo.getMatchingRange());
@@ -436,7 +470,7 @@ public class DeviceLibraryController {
             }
             if (libraryUpdateVo.getStorageType() != null && !libraryUpdateVo.getStorageType().equals(deviceLibraryEntity.getStorageType())) {
                 //添加装备日志
-                String remark = "将装备的入库类型由" + configCache.getStorageTypeMap().get(deviceLibraryEntity.getStorageType()) + "改为" + configCache.getStorageTypeMap().get(libraryUpdateVo.getStorageType());
+                String remark = "将装备的入库类型由" + configCache.getStorageTypeMap().getOrDefault(deviceLibraryEntity.getStorageType(),"空") + "改为" + configCache.getStorageTypeMap().get(libraryUpdateVo.getStorageType());
                 DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), remark, null);
                 deviceLogService.addLog(deviceLogDto);
                 deviceLibraryEntity.setStorageType(libraryUpdateVo.getStorageType());

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

@@ -34,7 +34,7 @@ public interface DeviceLibraryService {
      * @param deviceLibrarySelectVo 装备查询vo
      * @param pageable              获取标签管理分页
      */
-    Page<DeviceLibrary> getTagPage(DeviceLibrarySelectVo deviceLibrarySelectVo, Pageable pageable);
+    List<DeviceLibrary> getTagPage(DeviceLibrarySelectVo deviceLibrarySelectVo, Pageable pageable);
 
     /**
      * @param deviceLibrarySelectVo 装备查询vo
@@ -154,10 +154,15 @@ public interface DeviceLibraryService {
     int getDeviceCount();
 
     /**
-     * 获取所有装备map
+     * 获取所有装备id map
      */
     Map<Integer,DeviceLibrary> getAllDeviceMap();
 
+    /**
+     * 获取所有装备序列号map
+     */
+    Map<String,DeviceLibrary> getAllDeviceSeqMap();
+
     /**
      * 根据单位 以及生命状态集合 查询设备数量
      */

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

@@ -87,8 +87,10 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     }
 
     @Override
-    public Page<DeviceLibrary> getTagPage(DeviceLibrarySelectVo deviceLibrarySelectVo, Pageable pageable) {
-        return deviceLibraryDao.findAll(getSelectSpecification4(deviceLibrarySelectVo), deviceLibrarySelectVo.getPageable());
+    public List<DeviceLibrary> getTagPage(DeviceLibrarySelectVo deviceLibrarySelectVo, Pageable pageable) {
+        PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(deviceLibrarySelectVo);
+        predicateBuilder.notIn("ownUnit", unitsService.findSuperiorUnitsList().stream().map(Units::getName).toArray());
+        return deviceLibraryDao.findAll(predicateBuilder.build());
     }
 
     @Override
@@ -478,6 +480,16 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         return libraries.stream().collect(Collectors.toMap(DeviceLibrary::getId, Function.identity()));
     }
 
+    /**
+     * 获取所有装备序列号map
+     */
+    @Override
+    public Map<String, DeviceLibrary> getAllDeviceSeqMap() {
+        List<DeviceLibrary> libraries = deviceLibraryDao.findAll();
+        libraries.forEach(DeviceLibrary::setConfigName);
+        return libraries.stream().filter(deviceLibrary -> deviceLibrary.getSeqNumber()!=null&&!"".equals(deviceLibrary.getSeqNumber())).collect(Collectors.toMap(DeviceLibrary::getSeqNumber, Function.identity()));
+    }
+
     @Override
     public Integer countAllRepel(List<Integer> fieldingIds, List<String> unitNames, List<String> seqNums,List<Integer> lifeStatusList) {
         //判断装备序列号是否为空 是 走列装id查询。
@@ -675,7 +687,14 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
             if (deviceLibrarySelectVo.getIsPart() != null) {
                 predicateBuilder.eq("isPart", deviceLibrarySelectVo.getIsPart());
             }
-
+            if (deviceLibrarySelectVo.getIsPrint()!=null){
+                if (deviceLibrarySelectVo.getIsPrint()==1){
+                    predicateBuilder.notIn("rfidSurfaceId", (Object) null);
+                }
+                else if (deviceLibrarySelectVo.getIsPrint()==0){
+                    predicateBuilder.eq("rfidSurfaceId", (Object) null);
+                }
+            }
             if (deviceLibrarySelectVo.getContent() != null) {
                 Class<DeviceLibrary> deviceLibraryEntity = DeviceLibrary.class;
                 Field[] declaredFields = deviceLibraryEntity.getDeclaredFields();

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

@@ -90,6 +90,9 @@ public class DeviceLibrarySelectVo extends CustomPage {
     @ApiModelProperty(value = "序列号模糊查询字段")
     private String seqDim;
 
+    @ApiModelProperty(value = "表面号模糊查询字段")
+    private String surfaceDim;
+
     @ApiModelProperty(value = "所在单位模糊查询字段")
     private String locationUnitDim;
 
@@ -102,6 +105,12 @@ public class DeviceLibrarySelectVo extends CustomPage {
     @ApiModelProperty(value = "更新时间模糊查询字段")
     private String updateTimeDim;
 
+    @ApiModelProperty(value = "创建时间模糊查询字段")
+    private String createTimeDim;
+
     @ApiModelProperty(value = "更新时间年份")
     private Integer year;
+
+    @ApiModelProperty(value = "查询是否打印标签（有没有表面号）装备")
+    private Integer isPrint;
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -248,7 +248,7 @@ public class MatchingDeviceController {
         }
         if (matchingDeviceEditVo.getLifeStatus() != null && !m.getLifeStatus().equals(matchingDeviceEditVo.getLifeStatus())) {
             //添加设备日志
-            String remark = "将设备的生命状态由" + configCache.getLifeStatusMap().get(m.getLifeStatus()) + "改为" + configCache.getLifeStatusMap().get(matchingDeviceEditVo.getLifeStatus());
+            String remark = "将设备的生命状态由" + configCache.getLifeStatusMap().getOrDefault(m.getLifeStatus(),"空") + "改为" + configCache.getLifeStatusMap().get(matchingDeviceEditVo.getLifeStatus());
             DeviceLogDto deviceLogDto = new DeviceLogDto(1, matchingDeviceEditVo.getMatchingDeviceId(), remark, null);
             deviceLogService.addLog(deviceLogDto);
             m.setLifeStatus(matchingDeviceEditVo.getLifeStatus());

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

@@ -15,13 +15,10 @@ import com.tykj.dev.device.packing.subject.domin.PackingLog;
 import com.tykj.dev.device.packing.subject.vo.*;
 import com.tykj.dev.device.task.service.TaskLogService;
 import com.tykj.dev.device.task.service.TaskService;
-import com.tykj.dev.device.task.subject.bto.TaskBto;
-import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
 import com.tykj.dev.device.user.read.service.MessageService;
 import com.tykj.dev.device.user.read.subject.bto.MessageBto;
 import com.tykj.dev.device.user.subject.service.UserPublicService;
 import com.tykj.dev.device.user.util.UserUtils;
-import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.GetTreeUtils;
@@ -92,18 +89,18 @@ public class PackingController {
     public ResponseEntity selectDetail(@PathVariable("billId") @Min(value = 1,message = "billId不能小于1") int billId) {
         PackingDetailVo packingDetailVo = new PackingDetailVo();
         //获取taskBto
-        TaskBto taskBto = taskService.get(billId, BusinessEnum.PACKING.id);
+//        TaskBto taskBto = taskService.get(billId, BusinessEnum.PACKING.id);
         //获取列装主件
         PackingLibrary packingLibraryEntity = packingLibraryService.getOne(billId);
-        packingLibraryEntity.setUserA(userPublicService.getOne(packingLibraryEntity.getUseraId()).getName());
-        packingLibraryEntity.setUserB(userPublicService.getOne(packingLibraryEntity.getUserbId()).getName());
+//        packingLibraryEntity.setUserA(userPublicService.getOne(packingLibraryEntity.getUseraId()).getName());
+//        packingLibraryEntity.setUserB(userPublicService.getOne(packingLibraryEntity.getUserbId()).getName());
         packingDetailVo.setPackingLibrary(packingLibraryEntity.setConfigName());
         //获取所有配件
         List<PackingLibrary> packingLibraryEntities = packingLibraryService.selectAllPart(billId);
         packingDetailVo.setParts(packingLibraryEntities);
         //获取业务日志
-        List<TaskLogUserVo> taskLogUserVos = taskLogService.getByTaskId(taskBto.getId());
-        packingDetailVo.setTaskLogUserVos(taskLogUserVos);
+        List<DeviceLogUserVo> deviceLogUserVos = packingLogDao.getAllByPackingId(billId).stream().map(PackingLog::toVo).sorted(Comparator.comparing(DeviceLogUserVo::getCreateTime).reversed()).collect(Collectors.toList());
+        packingDetailVo.setDeviceLogUserVos(deviceLogUserVos);
         return ResultUtil.success(packingDetailVo);
     }
 
@@ -448,7 +445,7 @@ public class PackingController {
         if (packingLibraryUpdateVo.getApplyType()!=null&&!packingLibraryUpdateVo.getApplyType().equals(packingLibrary.getApplyType())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将应用类型从"+configCache.getApplyTypeMap().get(packingLibrary.getApplyType())+"改为"+configCache.getApplyTypeMap().get(packingLibraryUpdateVo.getApplyType()));
+            packingLog.setRemark("将应用类型从"+configCache.getApplyTypeMap().getOrDefault(packingLibrary.getApplyType(),"空")+"改为"+configCache.getApplyTypeMap().get(packingLibraryUpdateVo.getApplyType()));
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setApplyType(packingLibraryUpdateVo.getApplyType());
@@ -456,7 +453,7 @@ public class PackingController {
         if (packingLibraryUpdateVo.getSecretLevel()!=null&&!packingLibraryUpdateVo.getSecretLevel().equals(packingLibrary.getSecretLevel())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将密级从"+configCache.getSecretLevelMap().get(packingLibrary.getSecretLevel())+"改为"+configCache.getSecretLevelMap().get(packingLibraryUpdateVo.getSecretLevel()));
+            packingLog.setRemark("将密级从"+configCache.getSecretLevelMap().getOrDefault(packingLibrary.getSecretLevel(),"空")+"改为"+configCache.getSecretLevelMap().get(packingLibraryUpdateVo.getSecretLevel()));
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setSecretLevel(packingLibraryUpdateVo.getSecretLevel());
@@ -464,7 +461,7 @@ public class PackingController {
         if (packingLibraryUpdateVo.getMatchingRange()!=null&&!packingLibraryUpdateVo.getMatchingRange().equals(packingLibrary.getMatchingRange())&&!packingLibraryService.matchingRangeIsExist(packingLibrary.getPartParentId(),packingLibraryUpdateVo.getMatchingRange())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将配用范围从"+configCache.getMatchingRangeMap().get(packingLibrary.getMatchingRange())+"改为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange()));
+            packingLog.setRemark("将配用范围从"+configCache.getMatchingRangeMap().getOrDefault(packingLibrary.getMatchingRange(),"空")+"改为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange()));
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setMatchingRange(packingLibraryUpdateVo.getMatchingRange());
@@ -472,7 +469,7 @@ public class PackingController {
         if (packingLibraryUpdateVo.getInvisibleRange()!=null&&!packingLibraryUpdateVo.getInvisibleRange().equals(packingLibrary.getInvisibleRange())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将可见范围从"+configCache.getInvisibleRangeMap().get(packingLibrary.getInvisibleRange())+"改为"+configCache.getInvisibleRangeMap().get(packingLibraryUpdateVo.getInvisibleRange()));
+            packingLog.setRemark("将可见范围从"+configCache.getInvisibleRangeMap().getOrDefault(packingLibrary.getInvisibleRange(),"空")+"改为"+configCache.getInvisibleRangeMap().get(packingLibraryUpdateVo.getInvisibleRange()));
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setInvisibleRange(packingLibraryUpdateVo.getInvisibleRange());
@@ -480,7 +477,7 @@ public class PackingController {
         if (packingLibraryUpdateVo.getType()!=null&&!packingLibraryUpdateVo.getType().equals(packingLibrary.getType())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将形态从"+configCache.getStyleMap().get(packingLibrary.getType())+"改为"+configCache.getStyleMap().get(packingLibraryUpdateVo.getType()));
+            packingLog.setRemark("将形态从"+configCache.getStyleMap().getOrDefault(packingLibrary.getType(),"空")+"改为"+configCache.getStyleMap().get(packingLibraryUpdateVo.getType()));
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setType(packingLibraryUpdateVo.getType());
@@ -488,7 +485,7 @@ public class PackingController {
         if (packingLibraryUpdateVo.getNature()!=null&&!packingLibraryUpdateVo.getNature().equals(packingLibrary.getNature())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将列装性质从"+configCache.getNatureMap().get(packingLibrary.getNature())+"改为"+configCache.getNatureMap().get(packingLibraryUpdateVo.getNature()));
+            packingLog.setRemark("将列装性质从"+configCache.getNatureMap().getOrDefault(packingLibrary.getNature(),"空")+"改为"+configCache.getNatureMap().get(packingLibraryUpdateVo.getNature()));
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setNature(packingLibraryUpdateVo.getNature());
@@ -506,7 +503,8 @@ public class PackingController {
         if (packingLibraryUpdateVo.getProdUnit()!=null&&!packingLibraryUpdateVo.getProdUnit().equals(packingLibrary.getProdUnit())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将生产单位从"+packingLibrary.getProdUnit()+"改为"+packingLibraryUpdateVo.getProdUnit());
+            String origin = packingLibrary.getProdUnit()==null?"无":packingLibrary.getProdUnit();
+            packingLog.setRemark("将生产单位从"+origin+"改为"+packingLibraryUpdateVo.getProdUnit());
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setProdUnit(packingLibraryUpdateVo.getProdUnit());
@@ -514,7 +512,8 @@ public class PackingController {
         if (packingLibraryUpdateVo.getPrice()!=null&&!packingLibraryUpdateVo.getPrice().equals(packingLibrary.getPrice())){
             //添加列装日志
             PackingLog packingLog = new PackingLog();
-            packingLog.setRemark("将价格从"+packingLibrary.getPrice()+"改为"+packingLibraryUpdateVo.getPrice());
+            String origin = packingLibrary.getPrice()==null?"无":packingLibrary.getPrice();
+            packingLog.setRemark("将价格从"+origin+"改为"+packingLibraryUpdateVo.getPrice());
             packingLog.setPackingId(packingLibrary.getId());
             packingLogService.add(packingLog);
             packingLibrary.setPrice(packingLibraryUpdateVo.getPrice());

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingDetailVo.java

 package com.tykj.dev.device.packing.subject.vo;
 
+import com.tykj.dev.device.library.subject.vo.DeviceLogUserVo;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
-import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,5 +24,5 @@ public class PackingDetailVo {
     private List<PackingLibrary> parts;
 
     @ApiModelProperty(name = "业务日志")
-    private List<TaskLogUserVo> taskLogUserVos;
+    private List<DeviceLogUserVo> deviceLogUserVos;
 }

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

@@ -259,7 +259,7 @@ public class RepairController {
         if (detailIds.size()>0){
             detailIds.forEach(integer -> {
                 RepairDetail repairDetail = deviceRepairDetailService.getOne(integer);
-                if (repairDetail.getRepairStatus()!=1&&repairDetail.getRepairStatus()!=9){
+                if ((repairDetail.getRepairStatus()!=1&&repairDetail.getRepairStatus()!=9)||repairDetailDao.findAllByPid(repairDetail.getId()).size()>0){
                     throw new ApiException(ResponseEntity.status(303).body("序列号"+repairDetail.getSeqNumber()+"的装备已被其他专管员操作"));
                 }
             });
@@ -417,6 +417,16 @@ public class RepairController {
                 repairDetail.setLocationUnit(repairBillSaveVo.getReceiveUnit());
                 repairDetail.setRepairStatus(1);
                 deviceRepairDetailService.update(repairDetail);
+                if (repairDetail.getPid()!=null){
+                    RepairDetail repairDetail1 = deviceRepairDetailService.getOne(repairDetail.getPid());
+                    repairDetail1.setLocationUnit(repairBill.getReceiveUnit());
+                    deviceRepairDetailService.update(repairDetail1);
+                    if (repairDetail1.getPid()!=null){
+                        RepairDetail repairDetail2 = deviceRepairDetailService.getOne(repairDetail.getPid());
+                        repairDetail2.setLocationUnit(repairBill.getReceiveUnit());
+                        deviceRepairDetailService.update(repairDetail2);
+                    }
+                }
             });
         }
         //添加出库白名单
@@ -541,6 +551,11 @@ public class RepairController {
             repairDetail.setLocationUnit(repairBill.getReceiveUnit());
             repairDetail.setRepairStatus(1);
             deviceRepairDetailService.update(repairDetail);
+            if (repairDetail.getPid()!=null){
+                RepairDetail repairDetail1 = deviceRepairDetailService.getOne(repairDetail.getPid());
+                repairDetail1.setLocationUnit(repairBill.getReceiveUnit());
+                deviceRepairDetailService.update(repairDetail1);
+            }
         });
         //发送阅知信息
         if (repairReceiveVo.getReceiveUserbId()!=null) {

dev-repair/src/main/java/com/tykj/dev/device/repair/repository/RepairDetailDao.java

@@ -16,4 +16,5 @@ public interface RepairDetailDao extends JpaRepository<RepairDetail, Integer>, J
     List<RepairDetail> findAllByRepairStatus(Integer repairStatus);
     List<RepairDetail> findAllByRepairStatus(Integer repairStatus, Sort s);
     List<RepairDetail> findAllByDeviceId(Integer deviceId);
+    List<RepairDetail> findAllByPid(Integer pid);
 }

dev-retired/src/main/java/com/tykj/dev/device/retired/controller/DeviceRetiredController.java

@@ -145,6 +145,7 @@ public class DeviceRetiredController {
         //发送阅知信息
         List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
         MessageBto messageBto = new MessageBto(task.getId(),task.getBusinessType(),"业务办结",userIds,0);
+        messageBto.setRecord(String.valueOf(task.getBillId()));
         messageService.add(messageBto);
         myWebSocket.sendMessage1();
         return ResultUtil.success("退装申请成功");

dev-statistical/src/main/java/com/tykj/dev/statistical/controller/StatisticalController.java

@@ -207,7 +207,7 @@ public class StatisticalController {
         SimpleDateFormat sdf =  new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
         List<DeviceLibrary> resultList = deviceLibraryService.getAllList(deviceLibrarySelectVo);
         resultList.forEach(DeviceLibrary::setConfigName);
-        if (hasModelDim||hasLifeStatusDim||hasLocationUnitDim||hasNameDim||hasOwnUnitDim||hasSeqDim) {
+        if (hasModelDim||hasLifeStatusDim||hasLocationUnitDim||hasNameDim||hasOwnUnitDim||hasSeqDim||hasYear) {
             resultList = resultList.stream().filter(deviceLibrary -> {
                 Boolean containModelDim = !hasModelDim||deviceLibrary.getModel().contains(deviceLibrarySelectVo.getModelDim());
                 Boolean containNameDim = !hasNameDim||deviceLibrary.getName().contains(deviceLibrarySelectVo.getNameDim());

dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java

@@ -208,6 +208,7 @@ public class StorageBillController {
         //是否申请业务导入
         List<DeviceApplyBill> deviceApplyBills = new ArrayList<>();
         Map<Integer, ApplyBillDetailVo> map = new HashMap<>();
+        Boolean isPrint = storageBillSaveVo.getIsPrint() != 0;
         if (storageBillSaveVo.getApplyTaskIds()!=null&&storageBillSaveVo.getApplyTaskIds().size()>0){
             for (Integer id:storageBillSaveVo.getApplyTaskIds()) {
                 TaskBto taskBto1 = taskService.get(id);
@@ -269,6 +270,10 @@ public class StorageBillController {
                 deviceLibraryEntity.setLocationUnit(userUtils.getCurrentUserUnitName());
                 deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
                 deviceLibraryEntity.setPartParentId(null);
+                //如果未打印标签，表面号清空
+                if (!isPrint){
+                    deviceLibraryEntity.setRfidSurfaceId(null);
+                }
                 if (deviceLibraryEntity.getRfidCardId()==null||"".equals(deviceLibraryEntity.getRfidCardId())){
                     deviceLibraryEntity.setRfidCardId(null);
                 }

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/domin/StorageBill.java

@@ -150,6 +150,9 @@ public class StorageBill {
     @ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
     private Integer deleteTag = 0;
 
+    @ApiModelProperty(value = "是否打印标签(0:未打印，1:已打印)")
+    private Integer isPrint;
+
     @ApiModelProperty(value = "经办人")
     @Transient
     private String receiveUserA;

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/StorageBillSaveVo.java

@@ -28,6 +28,9 @@ public class StorageBillSaveVo {
     @ApiModelProperty(value = "任务Id")
     private Integer taskId;
 
+    @ApiModelProperty(value = "是否打印rfid标签(1:是，0:否)")
+    private Integer isPrint = 0;
+
     @ApiModelProperty(value = "导入申请任务Id集合")
     private List<Integer> applyTaskIds;
 

dev-task/src/main/java/com/tykj/dev/device/task/repository/TaskDao.java

@@ -73,6 +73,8 @@ public interface TaskDao extends JpaRepository<Task, Integer>, JpaSpecificationE
 
     List<Task> findAllByBusinessType(Integer businessType);
 
+    List<Task> findAllByBusinessTypeAndBillStatus(Integer businessType,Integer billStatus);
+
     List<Task> findAllByBillIdInAndBusinessType(List<Integer> ids,Integer type);
 
     List<Task> findAllByBusinessTypeAndCustomInfo(Integer businessType,String customInfo);

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

@@ -898,7 +898,7 @@ public class TaskServiceImpl implements TaskService {
         //查询跟踪
         if (taskSelectVo.getSelectNum() == 3) {
             //所有涉及人员所在单位包含当前用户所在单位且指针对应UserId不是当前用户
-            List<Integer> status = Arrays.asList(201,333,810,322,722,788,1250,2223,8110,888);
+            List<Integer> status = Arrays.asList(201,333,810,322,722,788,1250,2223,8110,888,140);
             List<TaskBto> taskBtoList = taskBtos.stream()
                     .filter(taskBto -> {
 //                        boolean unitExists = getUnitsByUsers(taskBto.getInvolveUserIdList()).contains(unitId);