两个规定App端-任务列表时间筛选不生效

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/ESPlanTaskListDto.java

 package com.yeejoin.amos.patrol.dao.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,10 +41,10 @@ public class ESPlanTaskListDto {
     @Field(type = FieldType.Text)
     private String type;
 
-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.Keyword)
     private String beginTime;
 
-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.Keyword)
     private String endTime;
 
     @Field(type = FieldType.Keyword)

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -100,6 +100,7 @@ import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.slf4j.Logger;
@@ -1720,6 +1721,18 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             boolMust.must(query);
         }
 
+        if (!ObjectUtils.isEmpty(params.get("startTime"))) {
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.rangeQuery("beginTime").gte(params.get("startTime")));
+            boolMust.must(query);
+        }
+
+        if (!ObjectUtils.isEmpty(params.get("endTime"))) {
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.rangeQuery("endTime").lte(params.get("endTime")));
+            boolMust.must(query);
+        }
+
         builder.query(boolMust);
         if (!ValidationUtil.isEmpty(params.get("orderBy"))) {
             String[] split = params.get("orderBy").toString().split(" ");