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

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

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
+import java.util.stream.Stream;
 
 import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_DETAIL;
 import static com.tykj.dev.misc.base.BusinessEnum.CONFIRM_CHECK_STAT;
@@ -170,7 +171,8 @@ public class ExamController {
 
     @ApiOperation(value = "发起核查", notes = "对指定单位发起核查任务")
     @PostMapping("/confirm/startCheck")
-    public ResponseEntity startNewCheck(@RequestBody CheckCheckVo ccVO) {
+    public ResponseEntity startNewCheck(@RequestBody CheckCheckVo ccVO,
+                                        @RequestParam(defaultValue = "0", required = false) Integer filter) {
 
         List<CheckExamDetailVo> list = new ArrayList<>();
         CheckExamDetailVo checkExamDetailVo = new CheckExamDetailVo("", Collections.emptyList(), ccVO.getUnitRange(), ccVO.getRemark());
@@ -182,7 +184,7 @@ public class ExamController {
                 0, list
         );
 
-        startExam(checkExamVo, false);
+        startExam(checkExamVo, false, filter);
         return ResponseEntity.ok("发起核查成功");
 
     }
@@ -198,7 +200,8 @@ public class ExamController {
     @ApiOperation(value = "发起检查", notes = "手动发起核查，需要指定参数")
     @PostMapping("/confirm/startExam")
     public ResponseEntity<ResultObj> startExam(@RequestBody CheckExamVo ceVo,
-                                               @RequestParam(defaultValue = "true", required = false) boolean isExam) {
+                                               @RequestParam(defaultValue = "true", required = false) boolean isExam,
+                                               @RequestParam(defaultValue = "0", required = false) Integer filter) {
 
         // 获取需要处理的代管单位集合
         List<Integer> esIds = checkUnitService.findAllEscrow().stream().map(Units::getUnitId).collect(toList());
@@ -267,10 +270,24 @@ public class ExamController {
                 .collect(groupingBy(DeviceLibrary::getOwnUnit));
 
         // 非在库装备 ls !=2 and ls !=14
-        Map<String, List<DeviceLibrary>> devNotInLib = dcService.getAllDeviceLibraryList().stream()
-                .filter(d -> d.getLifeStatus() != 2 && d.getLifeStatus() != 14)
-                .collect(groupingBy(DeviceLibrary::getOwnUnit));
+        Stream<DeviceLibrary> deviceLibraryStream = dcService.getAllDeviceLibraryList().stream()
+                .filter(d -> d.getLifeStatus() != 2 && d.getLifeStatus() != 14);
 
+        Map<String, List<DeviceLibrary>> devNotInLib = new HashMap<>();
+        switch (filter) {
+            case 1:
+                // 维修状态 4
+                devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 4).collect(groupingBy(DeviceLibrary::getOwnUnit));
+                break;
+            case 2:
+                // 过滤退役中 16
+                devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 16).collect(groupingBy(DeviceLibrary::getOwnUnit));
+                break;
+            case 3:
+                devNotInLib = deviceLibraryStream.filter(d -> d.getLifeStatus() != 16).filter(d -> d.getLifeStatus() != 4).collect(groupingBy(DeviceLibrary::getOwnUnit));
+                break;
+            default:
+        }
 
         // 3 如果是省级账户发起的检查，需要构建省局、省直属、市级的统计任务
         // 3-1 核查/检查，创建省局单位的账单及详情