专题创建逻辑完善以及bug修改

src/main/java/com/zzsn/event/controller/SubjectManageController.java

@@ -629,6 +629,19 @@ public class SubjectManageController {
     }
 
     /**
+     * 专题绑定的信息源标签列表
+     *
+     * @param subjectId 专题id
+     * @author lkg
+     * @date 2025/1/13
+     */
+    @GetMapping("/subjectBindLabelList")
+    public Result<?> subjectBindLabelList(@RequestParam String subjectId) {
+        List<InfoSourceLabelVO> bindList = clbLabelService.bindInfoSourceLabelInfo(subjectId);
+        return Result.OK(bindList);
+    }
+
+    /**
      * 绑定信息源标签数据
      *
      * @param subjectSourceTagVO 参数

src/main/java/com/zzsn/event/es/EsService.java

@@ -1739,8 +1739,8 @@ public class EsService {
             boolQuery.mustNot(QueryBuilders.termQuery("deleteFlag", "1"));
         }
         //专题库类别筛选
-        if (searchCondition.getClassificationType() != null) {
-            boolQuery.must(QueryBuilders.termQuery("classificationType", searchCondition.getClassificationType()));
+        if (CollectionUtils.isNotEmpty(searchCondition.getClassificationType())) {
+            boolQuery.must(QueryBuilders.termsQuery("classificationType", searchCondition.getClassificationType()));
         }
         //得分范围筛选
         Integer minScore = searchCondition.getMinScore();

src/main/java/com/zzsn/event/vo/InfoDataSearchCondition.java

@@ -38,7 +38,7 @@ public class InfoDataSearchCondition {
     private String endTime;
 
     //专题库类型(对应字典编码为【Thematic_Library】的数据字典值)
-    private Integer classificationType;
+    private List<Integer> classificationType;
 
     //审核操作(0：未审核  1：审核通过  2：审核未通过  3：暂定  默认值为0)
     private Integer checkStatus;

src/main/java/com/zzsn/event/vo/SubjectDetailVO.java

@@ -22,12 +22,12 @@ public class SubjectDetailVO {
     /**专题描述*/
     private String remark;
     /**开始时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date timeEnable;
     /**结束时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date timeDisable;
     /**是否公开(0-未公开;1-已公开)*/
     private Integer facePublic;