更新

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBillSaveVo.java

@@ -143,8 +143,10 @@ public class AllotBillSaveVo {
         if(this.applyFiles!=null){
             allotBillEntity.setApplyFiles(FilesUtil.stringFileToList(this.applyFiles));
         }
+        //退回状态为退回中
         allotBillEntity.setBackStatus(0);
         allotBillEntity.setSendTime(TimestampUtil.getCurrentTimestamp());
+        //字段和配发不同的单独set
         allotBillEntity.setBackCheckDetail(this.allotCheckDetail);
         allotBillEntity.setBackCheckResult(this.allotCheckResult);
         allotBillEntity.setBackCount(this.allotCount);

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

@@ -125,29 +125,29 @@ public interface DeviceLibraryService {
     List<DeviceLibrary> getSendBackDevice(DeviceLibrarySelectVo deviceLibrarySelectVo);
 
     /**
-     * 判断装备状态是否在库
+     * 判断装备状态是否在库（若不是抛出303异常）
      */
     void isInStock(List<Integer> ids);
 
     /**
-     * 判断装备状态是否待退役
+     * 判断装备状态是否待退役（若不是抛出303异常）
      */
     void isWaitRetired(List<Integer> ids);
 
     /**
-     * 判断装备状态是否在库或待退役
+     * 判断装备状态是否在库或待退役（若不是抛出303异常）
      */
     void isInStockOrWaitRetired(List<Integer> ids);
 
 
     /**
-     * 判断装备状态是否丢失
+     * 判断装备状态是否丢失（若不是抛出303异常）
      * @param ids
      */
     void isNotLoss(List<Integer> ids);
 
     /**
-     * 判断装备状态是否在库或维修中
+     * 判断装备状态是否在库或维修中（若不是抛出303异常）
      */
     void isInStockOrRepairing(List<Integer> ids);
 

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

@@ -469,7 +469,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     }
 
     /**
-     * 判断装备状态是否在库或待退役
+     * 判断装备状态是否在库或待退役（若不是抛出303异常）
      *
      * @param ids 装备id集合
      */

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

@@ -166,7 +166,7 @@ public class PackingController {
         }
         if (packingLibraryService.matchingRangeIsExist(addPack.getPartParentId(),addPack.getMatchingRange(),addPack.getType(),addPack.getStyle(),addPack.getName(),addPack.getSecretLevel(),addPack.getInvisibleRange())){
             Map<String,Object> map = new HashMap<>();
-            map.put("error","型号"+addPack.getModel()+"下配用范围为"+configCache.getMatchingRangeMap().get(addPack.getMatchingRange())+"的装备已存在");
+            map.put("error","型号"+addPack.getModel()+"下配用范围为"+configCache.getMatchingRangeMap().get(addPack.getMatchingRange())+"的该装备已存在");
             return ResponseEntity.ok(map);
         }
         PackingLibrary packingLibrary = addPack.toDo();
@@ -448,7 +448,7 @@ public class PackingController {
     public ResponseEntity updateDevice(@RequestBody @Validated PackingLibraryUpdateVo packingLibraryUpdateVo){
         PackingLibrary packingLibrary = packingLibraryService.getOne(packingLibraryUpdateVo.getPackingId());
         if (!packingLibraryUpdateVo.getMatchingRange().equals(packingLibrary.getMatchingRange())&&packingLibraryService.matchingRangeIsExist(packingLibrary.getPartParentId(),packingLibraryUpdateVo.getMatchingRange(),packingLibraryUpdateVo.getType(),packingLibraryUpdateVo.getStyle(),packingLibraryUpdateVo.getName(),packingLibraryUpdateVo.getSecretLevel(),packingLibraryUpdateVo.getInvisibleRange())){
-            throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的装备");
+            throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的相同装备");
         }
         //复制相同的字段
         if (packingLibraryUpdateVo.getName()!=null&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())&&!packingLibraryService.nameIsExist(packingLibrary.getModel(),packingLibraryUpdateVo.getName())){

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -165,6 +165,12 @@ public class TaskController {
                         }
                     }
                 }
+                //set新增的task高亮字段
+                taskUserVos.forEach(taskUserVo -> {
+                    if (taskIds.contains(taskUserVo.getId())){
+                        taskUserVo.setIsNew(1);
+                    }
+                });
             }
         }
         return ResultUtil.success(taskUtils.orderByTopDescAndReadAsc(taskUserVos));

dev-task/src/main/java/com/tykj/dev/device/task/subject/vo/TaskUserVo.java

@@ -91,6 +91,10 @@ public class TaskUserVo {
     @Transient
     private Integer isTop = 0;
 
+    @ApiModelProperty(value = "是否新高亮待办(0:不是，1:是)")
+    @Transient
+    private Integer isNew = 0;
+
     @ApiModelProperty(value = "状态描述")
     private String status;
 

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

@@ -121,6 +121,12 @@ public class MessageServiceImpl implements MessageService {
                 userRecordService.save(userRecord);
             }
         }
+        //设置新增的阅知字段
+        messageUserVos.forEach(messageUserVo -> {
+            if (ids.contains(messageUserVo.getId())){
+                messageUserVo.setIsNew(1);
+            }
+        });
         return messageUserVos;
     }
 

dev-user/src/main/java/com/tykj/dev/device/user/read/subject/vo/MessageUserVo.java

@@ -54,6 +54,9 @@ public class MessageUserVo {
     @ApiModelProperty(value = "是否高亮(0：不是，1：是)")
     private Integer isHighLight = 0;
 
+    @ApiModelProperty(value = "是否新增(0：不是，1：是)")
+    private Integer isNew = 0;
+
     @ApiModelProperty(value = "操作人")
     private String operator;