[修改]工单分页查询

common/src/main/java/com/keymobile/governworkorder/common/bo/WorkOrderInfoVO.java

@@ -39,7 +39,7 @@ public class WorkOrderInfoVO {
     /**
      * 工单状态 待处理、处理中
      */
-    @Schema(description = "工单状态 待处理、处理中")
+    @Schema(description = "工单状态 待发起、处理中、工单关闭、工单失效")
     private String status;
     /**
      * 流程环节 发起、处理、审批

core/src/main/java/com/keymobile/governworkorder/core/dto/WorkOrdeQueryDto.java

@@ -23,10 +23,14 @@ public class WorkOrdeQueryDto {
     private Sort.Direction direction = Sort.Direction.DESC;
     @Schema(description = "工单级别")
     private String level;
-    @Schema(description = "工单状态")
+    @Schema(description = "流程环节  流程环节 发起、处理、审批、关闭、失效")
+    private String stage;
+    @Schema(description = "工单状态  待发起、处理中、工单关闭、工单失效")
     private String status;
-    @Schema(description = "工单类型")
+    @Schema(description = "工单类型  资产完善、资产下架、资产新增、资产转移")
     private String type;
+    @Schema(description = "资产类型  数据指标、数据资产、元数据、数据标准")
+    private String dataType;
     @Schema(description = "关键字")
     private String keyword;
     @Schema(description = "创建开始时间")

core/src/main/java/com/keymobile/governworkorder/core/persistence/model/WorkOrderInfo.java

@@ -36,7 +36,7 @@ public class WorkOrderInfo {
      */
     private String level;
     /**
-     * 工单状态 待处理、处理中
+     * 工单状态 待发起、处理中、工单关闭、工单失效
      */
     private String status;
     /**

core/src/main/java/com/keymobile/governworkorder/core/service/impl/WorkOrderServiceImpl.java

@@ -79,6 +79,12 @@ public class WorkOrderServiceImpl implements WorkOrderService {
         if (StringUtils.isNotBlank(param.getStatus())) {
             query.addCriteria(Criteria.where("status").is(param.getStatus()));
         }
+        if (StringUtils.isNotBlank(param.getDataType())) {
+            query.addCriteria(Criteria.where("dataType").is(param.getDataType()));
+        }
+        if (StringUtils.isNotBlank(param.getStage())) {
+            query.addCriteria(Criteria.where("stage").is(param.getStage()));
+        }
         if (StringUtils.isNotBlank(param.getKeyword())) {
             query.addCriteria(new Criteria().orOperator(
                     Criteria.where("desc").regex(param.getKeyword()),