条件字段调整；审核状态整合

src/main/java/com/zzsn/event/controller/reportData/ReportDataController.java

@@ -56,7 +56,7 @@ public class ReportDataController {
      * @date 2025/4/9
      */
     @GetMapping("/searchFieldList")
-    public Result<?> fieldList(){
+    public Result<?> fieldList() {
         List<Map<String, Object>> fieldDetails = FieldUtil.requestFieldDetails(SearchCondition.class);
         return Result.OK(fieldDetails);
     }
@@ -68,7 +68,7 @@ public class ReportDataController {
      * @date 2025/4/9
      */
     @GetMapping("/responseFieldList")
-    public Result<?> responseFieldList(){
+    public Result<?> responseFieldList() {
         List<Map<String, Object>> fieldDetails = FieldUtil.responseFieldDetails(ReportDataVO.class);
         return Result.OK(fieldDetails);
     }
@@ -80,7 +80,7 @@ public class ReportDataController {
      * @date 2025/4/9
      */
     @PostMapping("/dataList")
-    public Result<?> dataList(@RequestBody SearchCondition searchCondition){
+    public Result<?> dataList(@RequestBody SearchCondition searchCondition) {
         try {
             List<ReportDataVO> pageList = pageList(searchCondition);
             return Result.OK(pageList);
@@ -91,7 +91,6 @@ public class ReportDataController {
     }
 
 
-
     /**
      * 事件对应专题库的资讯分页列表
      *
@@ -149,6 +148,22 @@ public class ReportDataController {
                 searchSourceBuilder.sort("publishDate", SortOrder.DESC);
                 break;
         }
+        //审核状态
+        Integer status = searchCondition.getStatus();
+        if (status != null) {
+            if (status == 1) {
+                searchCondition.setCheckStatus(1);
+            } else if (status == 2) {
+                searchCondition.setCheckStatus(0);
+                searchCondition.setDeleteFlag(0);
+            } else if (status == 3) {
+                searchCondition.setCheckStatus(3);
+            } else if (status == 4) {
+                searchCondition.setDeleteFlag(1);
+            } else if (status == 5) {
+                searchCondition.setIsFreeCheck(1);
+            }
+        }
         //构建es查询条件
         BoolQueryBuilder boolQuery = buildQuery(searchCondition);
         searchSourceBuilder.query(boolQuery);
@@ -182,7 +197,7 @@ public class ReportDataController {
         String searchWord = searchCondition.getSearchWord();
         if (StringUtils.isNotEmpty(searchWord)) {
             if ("all".equalsIgnoreCase(searchScope)) {
-                boolQuery.must(QueryBuilders.multiMatchQuery(searchWord, "title", "content","origin"));
+                boolQuery.must(QueryBuilders.multiMatchQuery(searchWord, "title", "content", "origin"));
             } else {
                 boolQuery.must(QueryBuilders.matchPhraseQuery(searchScope, searchWord));
             }

src/main/java/com/zzsn/event/controller/reportData/SearchCondition.java

@@ -11,29 +11,23 @@ import java.util.List;
 @Data
 public class SearchCondition {
 
-    /**任务id*/
-    @FieldDescription(value = "任务id")
-    private String taskId;
-
-
     //专题id
     @FieldDescription(value = "专题id")
     private String subjectId;
 
     //搜索范围(all、title、content、origin)
     @FieldDescription(value = "搜索范围")
-    private String searchScope;
+    private String searchScope = "title";
     //搜索词
     @FieldDescription(value = "搜索词")
     private String searchWord;
 
     //开始时间
-    @FieldDescription(value = "开始时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     //结束时间
-    @FieldDescription(value = "结束时间")
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
@@ -46,13 +40,16 @@ public class SearchCondition {
     @FieldDescription(value = "原创性")
     private String originality;
 
-    //审核操作(0：未审核  1：审核通过  2：审核未通过  3：暂定  默认值为0)
+    //审核状态(1-通过;2-未审核;3-暂定;4-删除;5-免审核)
     @FieldDescription(value = "审核状态")
-    private Integer checkStatus;
+    private Integer status;
 
+    //审核操作(0：未审核  1：审核通过  2：审核未通过  3：暂定  默认值为0)
+    private Integer checkStatus;
     //删除标记(1:删除；0:未删除)
-    @FieldDescription(value = "删除标记")
     private Integer deleteFlag = 0;
+    //是否免审核(1-是;0-否)
+    private Integer isFreeCheck;
 
     //爬虫类型
     @FieldDescription(value = "爬虫类型")
@@ -76,14 +73,8 @@ public class SearchCondition {
     @FieldDescription(value = "地域标签id集合")
     private List<String> areaLabelIds;
     //专题关联信息源标签集合
-    @FieldDescription(value = "专题关联信息源标签集合",valid = false)
     private List<Label> infoSourceLabelList;
 
-
-    //是否免审核(1-是;0-否)
-    @FieldDescription(value = "免审核状态")
-    private Integer isFreeCheck;
-
     //得分范围-研究中心
     //最小得分
     @FieldDescription(value = "最小得分")