Skip to content

X
xzxt-api-report
Commit cb0f509b by liulianglang
Options

抓获时间修改

parent a6c705ea
Showing with 8 additions and 8 deletions
src/main/java/com/founder/service/impl/ZtryServiceImpl.java
......@@ -310,15 +310,15 @@ public class ZtryServiceImpl implements ZtryService {
//抓获日期
if (StringUtils.isNotEmpty(ztry.getZhrqStart()) && StringUtils.isNotEmpty(ztry.getZhrqEnd())) {
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrqStr.keyword").gte(ztry.getZhrqStart()).lte(ztry.getZhrqEnd());
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrq.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());
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrq.keyword").gte(ztry.getZhrqStart());
bqXyr.must(rangeQueryBuilder);
}
if (StringUtils.isNotEmpty(ztry.getZhrqEnd())) {
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrqStr.keyword").lte(ztry.getZhrqEnd());
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrq.keyword").lte(ztry.getZhrqEnd());
bqXyr.must(rangeQueryBuilder);
}
}
......@@ -541,15 +541,15 @@ public class ZtryServiceImpl implements ZtryService {
}
//抓获日期
if (StringUtils.isNotEmpty(ztry.getZhrqStart()) && StringUtils.isNotEmpty(ztry.getZhrqEnd())) {
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrqStr.keyword").gte(ztry.getZhrqStart()).lte(ztry.getZhrqEnd());
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrq.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());
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrq.keyword").gte(ztry.getZhrqStart());
bqXyr.must(rangeQueryBuilder);
}
if (StringUtils.isNotEmpty(ztry.getZhrqEnd())) {
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrqStr.keyword").lte(ztry.getZhrqEnd());
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("zhrq.keyword").lte(ztry.getZhrqEnd());
bqXyr.must(rangeQueryBuilder);
}
}
......@@ -827,9 +827,9 @@ public class ZtryServiceImpl implements ZtryService {
}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);
searchSourceBuilder.sort("zhrq.keyword",ASC).trackTotalHits(true);
}else if("8".equals(ztry.getPaixu())){
searchSourceBuilder.sort("zhrqStr.keyword",DESC).trackTotalHits(true);
searchSourceBuilder.sort("zhrq.keyword",DESC).trackTotalHits(true);
}else{
searchSourceBuilder.sort("xxrbksjRqsj.keyword",DESC).trackTotalHits(true);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment