feat(自查模块): 修改自查

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

@@ -7,6 +7,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * @author zsp
  * @create 2021/11/23 14:37
@@ -22,4 +24,7 @@ public class SelfCheckVo {
 
     @ApiModelProperty(value = "自查的id")
     private Integer selfBillId;
+
+    @ApiModelProperty(value = "过滤状态")
+    private List<String> filterStatusList;
 }

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -312,9 +312,15 @@ public class SelfCheckController {
     }
 
     @ApiOperation(value = "生成自查待办", notes = "可以通过这个接口生成自查待办")
-    @GetMapping(value = "/create/{type}/{storageLocationId}")
+//    @GetMapping(value = "/create/{type}/{storageLocationId}")
+    @PostMapping("/create")
     @Transactional(rollbackFor = Exception.class)
-    public ResponseEntity createTask(@PathVariable("type") int type,@PathVariable("storageLocationId") Integer storageLocationId){
+//    public ResponseEntity createTask(@PathVariable("type") int type,@PathVariable("storageLocationId") Integer storageLocationId,
+//                                     String filterStatus){
+        public ResponseEntity createTask(@RequestBody CreateVO createVO){
+        Integer type = createVO.getType();
+        Integer storageLocationId = createVO.getStorageLocationId();
+        String filterStatus = createVO.getFilterStatus();
         String message = type==0?"手动":"扫码";
         String message2 = type==0?"手动":"终端";
         String unitName = userUtils.getCurrentUserUnitName();
@@ -324,6 +330,7 @@ public class SelfCheckController {
         selfCheckBill.setCheckUnitId(userUtils.getCurrentUnitId());
         selfCheckBill.setTitle(unitName + "发起的"+message2+"自查任务");
         selfCheckBill.setStorageLocationId(storageLocationId);
+        selfCheckBill.setFilterStatus(filterStatus);
         SelfCheckBill selfCheckBill1 = selfExaminationBillService.addEntity(selfCheckBill);
         //发起待自查任务
         List<Integer> userIds = new ArrayList<>();
@@ -993,6 +1000,10 @@ public class SelfCheckController {
         String unit = userUtils.getCurrentUserUnitName();
         PredicateBuilder<DeviceLibrary> predicateBuilder = Specifications.and();
         predicateBuilder.eq("locationUnit", unit);
+        if (selfCheckVo.getFilterStatusList() != null){
+            predicateBuilder.notIn("lifeStatus",selfCheckVo.getFilterStatusList().toArray());
+
+        }
         if(selfBillId != null){
             SelfCheckBill checkBill = selfCheckBillService.getOne(selfBillId);
             Integer storageLocationId1 = checkBill.getStorageLocationId();
@@ -1042,6 +1053,12 @@ public class SelfCheckController {
         return ResultUtil.success(map);
     }
 
+    @GetMapping("findById")
+    @ApiOperation("通过id查询")
+    public ResponseEntity findById(Integer id){
+        return ResponseEntity.ok(selfCheckBillService.getOne(id));
+    }
+
 //    @ApiOperation(value = "发起日常检查业务", notes = "发起日常检查业务")
 //    @PostMapping(value = "/addDayBill")
 //    @Transactional(rollbackFor = Exception.class)

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/domin/SelfCheckBill.java

@@ -148,6 +148,9 @@ public class SelfCheckBill {
     @ApiModelProperty(value = "装备存放位置Id",notes = "默认是库房, null代表是所有库房")
     private Integer storageLocationId;
 
+    @ApiModelProperty(value = "过滤状态列表")
+    private String filterStatus;
+
     @ApiModelProperty(value = "装备存放位置Id",notes = "默认是库房, null代表是所有库房")
     @Transient
     private String storageLocationName;

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/subject/vo/CreateVO.java

+package com.tykj.dev.device.selfcheck.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("手动或者自动的vo")
+public class CreateVO {
+
+    @ApiModelProperty(name = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "库房id")
+    private Integer storageLocationId;
+
+    @ApiModelProperty(name = "过滤状态")
+    private String filterStatus;
+}