feat:更新核查过滤退役中和维修的功能

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -491,6 +491,20 @@ public class DeviceCheckController {
         List<DeviceLibrary> devInLib = devLib.get(true);
         List<DeviceLibrary> devNotInLib = devLib.get(false);
 
+        switch (detail.getFilter()) {
+            case 1:
+                devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 4).collect(toList());
+                break;
+            case 2:
+                devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 16).collect(toList());
+                break;
+            case 3:
+                devNotInLib = devNotInLib.stream().filter(o -> o.getLifeStatus() != 4).filter(o -> o.getLifeStatus() != 16).collect(toList());
+                break;
+            default:
+        }
+
+
         // 特殊单位处理 if DetailId = x , 则补充添加 name=[],[]单位的装备进来
         if (specialDetailId != 0 && specialUnits.size() != 0 && id == specialDetailId) {
             String unitsString = specialUnits.stream().collect(joining(",", "[", "]"));
@@ -1260,7 +1274,6 @@ public class DeviceCheckController {
                 }
             }
         }
-
         return ResponseEntity.ok(String.format("任务节点task id = %d 的任务已经成功关闭", checkTask.getId()));
     }
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/ExamController.java

@@ -344,6 +344,7 @@ public class ExamController {
                         devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
 
                 unitDetailDoc.setVar2(String.valueOf(CHECK_DETAIL_CITY_0.id));
+                unitDetailDoc.setFilter(filter);
                 DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
                 detailIds.add(detail.getId());
                 // 将id放入统计中去 model ->  areaName -> detailId
@@ -407,6 +408,7 @@ public class ExamController {
                         devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
 
                 unitDetailDoc.setVar2(String.valueOf(CHECK_DETAIL_CITY_0.id));
+                unitDetailDoc.setFilter(filter);
                 DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
                 detailIds.add(detail.getId());
 
@@ -473,6 +475,7 @@ public class ExamController {
                             devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
 
                     unitDetailDoc.setVar2(String.valueOf(CHECK_DETAIL_CITY_0.id));
+                    unitDetailDoc.setFilter(filter);
                     DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
                     detailIds.add(detail.getId());
 
@@ -548,6 +551,7 @@ public class ExamController {
                             devNotInLib.getOrDefault(qu.getName(), new ArrayList<>()));
 
                     unitDetailDoc.setVar2(qu.getLevel() == 2 ? String.valueOf(CHECK_DETAIL_CITY_0.id) : String.valueOf(CHECK_DETAIL_REGION_0.id));
+                    unitDetailDoc.setFilter(filter);
                     DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
                     detailIds.add(detail.getId());
 
@@ -599,6 +603,7 @@ public class ExamController {
                         devNotInLib.getOrDefault(unit.getName(), new ArrayList<>()));
 
                 unitDetailDoc.setVar2(String.valueOf(CHECK_DETAIL_REGION_0.id));
+                unitDetailDoc.setFilter(filter);
                 DeviceCheckDetail detail = detailRepo.save(unitDetailDoc);
                 detailIds.add(detail.getId());
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetail.java

@@ -175,6 +175,9 @@ public class DeviceCheckDetail extends BaseEntity {
     @Column(name = "checkE_name")
     private String checkEName = "";
 
+    @ApiModelProperty(value = "非在库装备过滤条件;1_过滤维修;2_过滤退役中;3_过滤维修和退役")
+    private Integer filter;
+
     /**
      * 用于生成市级的核查详情账单的构造函数
      */