Merge branch 'develop_tzs_register' of…

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,13 +41,13 @@ 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.Text)
+    @Field(type = FieldType.Keyword)
     private String checkDate;
 
     @Field(type = FieldType.Text)

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

@@ -62,7 +62,9 @@ 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;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -478,7 +480,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         }
     }
 
-
+    @Override
     public void reformStatisticsPlanTask(String strBginDate, String strEndDate, String userId, String orgCode) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -877,6 +879,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         } else {
             try {
                 String isFixDate = plan.getIsFixedDate();// 是否固定日期
+                String planType = PlanTaskTypeStatusEnum.getEnum(Integer.valueOf(plan.getPlanType())).getName();
                 List<Long> pointIdList = iRoutePointDao.queryRoutePointIds(plan.getRouteId());
                 int pointNum = iRoutePointDao.countRoutePoint(plan.getRouteId());
                 long batchNo = now.getTime();
@@ -970,6 +973,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                     esPlanTaskListDto.setPlanTaskId(String.valueOf(planTask.getId()));
                     esPlanTaskListDto.setPlanId(String.valueOf(plan.getId()));
                     esPlanTaskListDto.setTaskName(plan.getName());
+                    esPlanTaskListDto.setType(planType);
                     esPlanTaskListDtos.add(esPlanTaskListDto);
                 }
                 em.flush();
@@ -1845,14 +1849,33 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             query.must(QueryBuilders.matchPhraseQuery("finishStatus", "*" + params.get("finishStatus") + "*"));
             boolMust.must(query);
         }
-//        if (!ObjectUtils.isEmpty(params.get("type"))) {
-//            BoolQueryBuilder query = QueryBuilders.boolQuery();
-//            query.must(QueryBuilders.matchPhraseQuery("type", "*" + params.get("type") + "*"));
-//            boolMust.must(query);
-//        }
+        if (!ObjectUtils.isEmpty(params.get("type"))) {
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.matchPhraseQuery("type", "*" + params.get("type") + "*"));
+            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);
-        //  builder.sort("checkDate", SortOrder.DESC);
+        if (!ValidationUtil.isEmpty(params.get("orderBy"))) {
+            String[] split = params.get("orderBy").toString().split(" ");
+            builder.sort(split[0], split[1].equals("desc") ? SortOrder.DESC : SortOrder.ASC);
+        } else {
+            builder.sort("checkDate", SortOrder.DESC);
+        }
+
+
         builder.from((Integer.parseInt(params.get("number").toString())) * Integer.parseInt(params.get("size").toString()));
         builder.size(Integer.parseInt(params.get("size").toString()));
         request.source(builder);