添加在逃es查询条件

src/main/java/com/founder/model/ZtryParam.java

@@ -202,11 +202,32 @@ public class ZtryParam  extends BaseModel {
 
     private Date zhrq;//抓获日期
 
+    private String zhrqStart;
+
+    public String getZhrqStart() {
+        return zhrqStart;
+    }
+
+    public void setZhrqStart(String zhrqStart) {
+        this.zhrqStart = zhrqStart;
+    }
+
+    public String getZhrqEnd() {
+        return zhrqEnd;
+    }
+
+    public void setZhrqEnd(String zhrqEnd) {
+        this.zhrqEnd = zhrqEnd;
+    }
+
+    private String zhrqEnd;
+
+
     private String zhdd_xzqhdm;//抓获地点_行政区划代码
 
     private String zhdd_dzmc;//抓获地点_地址名称
 
-    private String zhdw_gajgjgdm;//抓获单位_公安机关机构代码
+    private String zhdwGajgjgdm;//抓获单位_公安机关机构代码
 
     private String zhdw_gajgmc;//抓获单位_公安机关名称
 
@@ -220,7 +241,7 @@ public class ZtryParam  extends BaseModel {
 
     private Date cxsj;//撤销时间
 
-    private String djspdw_gajgjgdm;//登记审批单位_公安机关机构代码
+    private String djspdwGajgjgdm;//登记审批单位_公安机关机构代码
 
     private String djspdw_gajgmc;//登记审批单位_公安机关名称
 
@@ -1143,12 +1164,12 @@ public class ZtryParam  extends BaseModel {
         this.zhdd_dzmc = zhdd_dzmc;
     }
 
-    public String getZhdw_gajgjgdm() {
-        return zhdw_gajgjgdm;
+    public String getZhdwGajgjgdm() {
+        return zhdwGajgjgdm;
     }
 
-    public void setZhdw_gajgjgdm(String zhdw_gajgjgdm) {
-        this.zhdw_gajgjgdm = zhdw_gajgjgdm;
+    public void setZhdwGajgjgdm(String zhdwGajgjgdm) {
+        this.zhdwGajgjgdm = zhdwGajgjgdm;
     }
 
     public String getZhdw_gajgmc() {
@@ -1199,12 +1220,12 @@ public class ZtryParam  extends BaseModel {
         this.cxsj = cxsj;
     }
 
-    public String getDjspdw_gajgjgdm() {
-        return djspdw_gajgjgdm;
+    public String getDjspdwGajgjgdm() {
+        return djspdwGajgjgdm;
     }
 
-    public void setDjspdw_gajgjgdm(String djspdw_gajgjgdm) {
-        this.djspdw_gajgjgdm = djspdw_gajgjgdm;
+    public void setDjspdwGajgjgdm(String djspdwGajgjgdm) {
+        this.djspdwGajgjgdm = djspdwGajgjgdm;
     }
 
     public String getDjspdw_gajgmc() {

src/main/java/com/founder/service/impl/ZtryServiceImpl.java

@@ -23,6 +23,9 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.elasticsearch.search.sort.SortOrder.ASC;
+import static org.elasticsearch.search.sort.SortOrder.DESC;
+
 @Service
 public class ZtryServiceImpl implements ZtryService {
     @Resource
@@ -34,7 +37,7 @@ public class ZtryServiceImpl implements ZtryService {
 //        bqXyr.must(termQueryBuilderXxsc);
         //姓名
         if (StringUtils.isNotEmpty(ztry.getXm())) {
-            WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xm", "*" + ztry.getXm() + "*");
+            WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xm.keyword", "*" + ztry.getXm() + "*");
             bqXyr.must(wildcardQueryBuilder);
         }
         //人员编号
@@ -71,6 +74,7 @@ public class ZtryServiceImpl implements ZtryService {
         }
 
         //上网时间
+
         if (StringUtils.isNotEmpty(ztry.getXxrbksjStart()) && StringUtils.isNotEmpty(ztry.getXxrbksjEnd())) {
             RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("xxrbksjRqsj.keyword").gte(ztry.getXxrbksjStart()).lte(ztry.getXxrbksjEnd());
             bqXyr.must(rangeQueryBuilder);
@@ -98,6 +102,20 @@ public class ZtryServiceImpl implements ZtryService {
                 bqXyr.must(rangeQueryBuilder);
             }
         }
+        //抓获日期
+        if (StringUtils.isNotEmpty(ztry.getZhrqStart()) && StringUtils.isNotEmpty(ztry.getZhrqEnd())) {
+            RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrqStr.keyword").gte(ztry.getZhrqStart()).lte(ztry.getZhrqEnd());
+            bqXyr.must(rangeQueryBuilder);
+        } else {
+            if (StringUtils.isNotEmpty(ztry.getZhrqStart())) {
+                RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrqStr.keyword").gte(ztry.getZhrqStart());
+                bqXyr.must(rangeQueryBuilder);
+            }
+            if (StringUtils.isNotEmpty(ztry.getZhrqEnd())) {
+                RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrqStr.keyword").lte(ztry.getZhrqEnd());
+                bqXyr.must(rangeQueryBuilder);
+            }
+        }
         //立案单位
         if (StringUtils.isNotEmpty(ztry.getLadwGajgjgdm())) {
             String unitcode = ztry.getLadwGajgjgdm();
@@ -115,6 +133,40 @@ public class ZtryServiceImpl implements ZtryService {
             WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("ladwGajgjgdm", unitcode + "*");
             bqXyr.must(wildcardQueryBuilder);
         }
+        //抓获单位
+        if (StringUtils.isNotEmpty(ztry.getZhdwGajgjgdm())) {
+            String unitcode = ztry.getZhdwGajgjgdm();
+            if (unitcode.endsWith("0000000000")) {
+                unitcode = unitcode.substring(0, 2);
+            }
+            // 市局
+            else if (unitcode.endsWith("00000000")) {
+                unitcode = unitcode.substring(0, 4);
+            }
+            // 分局
+            else if (unitcode.endsWith("000000")) {
+                unitcode = unitcode.substring(0, 6);
+            }
+            WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("zhdwGajgjgdm", unitcode + "*");
+            bqXyr.must(wildcardQueryBuilder);
+        }
+        //上网单位
+        if (StringUtils.isNotEmpty(ztry.getDjspdwGajgjgdm())) {
+            String unitcode = ztry.getDjspdwGajgjgdm();
+            if (unitcode.endsWith("0000000000")) {
+                unitcode = unitcode.substring(0, 2);
+            }
+            // 市局
+            else if (unitcode.endsWith("00000000")) {
+                unitcode = unitcode.substring(0, 4);
+            }
+            // 分局
+            else if (unitcode.endsWith("000000")) {
+                unitcode = unitcode.substring(0, 6);
+            }
+            WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("djspdwGajgjgdm", unitcode + "*");
+            bqXyr.must(wildcardQueryBuilder);
+        }
         // 案件类别代码模糊查询
         if (StringUtils.isNotEmpty(ztry.getAjlbdm())) {
             // 根据规则截取前三位
@@ -192,7 +244,31 @@ public class ZtryServiceImpl implements ZtryService {
         int limit = ztry.getLimit();
         int begin = (page - 1) * limit;
 
-        searchSourceBuilder.query(boolQueryBuilder).from(begin).size(limit).trackTotalHits(true);
+//        searchSourceBuilder.query(boolQueryBuilder).from(begin).size(limit).sort("xxrbksjRqsj.keyword",DESC).trackTotalHits(true);
+        searchSourceBuilder.query(boolQueryBuilder).from(begin).size(limit);
+        if(StringUtils.isNotEmpty(ztry.getPaixu())){
+            if("1".equals(ztry.getPaixu())){
+                searchSourceBuilder.sort("larq.keyword",ASC).trackTotalHits(true);
+            }else if("2".equals(ztry.getPaixu())){
+                searchSourceBuilder.sort("larq.keyword",DESC).trackTotalHits(true);
+            }else if("3".equals(ztry.getPaixu())){
+                searchSourceBuilder.sort("xxrbksjRqsj.keyword",ASC).trackTotalHits(true);
+            }else if("4".equals(ztry.getPaixu())){
+                searchSourceBuilder.sort("xxrbksjRqsj.keyword",DESC).trackTotalHits(true);
+            }else if("5".equals(ztry.getPaixu())){
+                searchSourceBuilder.sort("tpsj.keyword",ASC).trackTotalHits(true);
+            }else if("6".equals(ztry.getPaixu())){
+                searchSourceBuilder.sort("tpsj.keyword",DESC).trackTotalHits(true);
+            }else if("7".equals(ztry.getPaixu())){
+                searchSourceBuilder.sort("zhrqStr.keyword",ASC).trackTotalHits(true);
+            }else if("8".equals(ztry.getPaixu())){
+                searchSourceBuilder.sort("zhrqStr.keyword",DESC).trackTotalHits(true);
+            }else{
+                searchSourceBuilder.sort("xxrbksjRqsj.keyword",DESC).trackTotalHits(true);
+            }
+        }else {
+            searchSourceBuilder.sort("xxrbksjRqsj.keyword",DESC).trackTotalHits(true);
+        }
         searchRequest.source(searchSourceBuilder);
         try {
             SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);