Commit ebb44e37 by wuchengwu

全国在逃添加:非检察院立案查询条件

parent 329e58ad
...@@ -6,6 +6,8 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -6,6 +6,8 @@ import org.springframework.beans.factory.annotation.Value;
import java.util.Date; import java.util.Date;
public class ZtryParam extends BaseModel { public class ZtryParam extends BaseModel {
private boolean ifzttj;//是否为在逃人员统计
private boolean ifjcyla;//是否为检察院立案
private String zbdw_gajgjgdm;//主办单位_公安机关机构代码 private String zbdw_gajgjgdm;//主办单位_公安机关机构代码
private String zbdw_gajgmc;//主办单位_公安机关名称 private String zbdw_gajgmc;//主办单位_公安机关名称
...@@ -62,6 +64,14 @@ public class ZtryParam extends BaseModel { ...@@ -62,6 +64,14 @@ public class ZtryParam extends BaseModel {
private String larq;//立案日期 private String larq;//立案日期
public boolean isIfjcyla() {
return ifjcyla;
}
public void setIfjcyla(boolean ifjcyla) {
this.ifjcyla = ifjcyla;
}
public String getLarqStart() { public String getLarqStart() {
return larqStart; return larqStart;
} }
...@@ -329,6 +339,14 @@ public class ZtryParam extends BaseModel { ...@@ -329,6 +339,14 @@ public class ZtryParam extends BaseModel {
private String hjdzFlag; private String hjdzFlag;
private String ladwFlag; private String ladwFlag;
public boolean isIfzttj() {
return ifzttj;
}
public void setIfzttj(boolean ifzttj) {
this.ifzttj = ifzttj;
}
public String getHjdzFlag() { public String getHjdzFlag() {
return hjdzFlag; return hjdzFlag;
} }
......
...@@ -7,6 +7,7 @@ import com.founder.model.XyrParam; ...@@ -7,6 +7,7 @@ import com.founder.model.XyrParam;
import com.founder.model.ZtryParam; import com.founder.model.ZtryParam;
import com.founder.service.ZtryService; import com.founder.service.ZtryService;
import com.founder.util.DateUtil; import com.founder.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.TotalHits;
import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequest;
...@@ -27,6 +28,7 @@ import static org.elasticsearch.search.sort.SortOrder.ASC; ...@@ -27,6 +28,7 @@ import static org.elasticsearch.search.sort.SortOrder.ASC;
import static org.elasticsearch.search.sort.SortOrder.DESC; import static org.elasticsearch.search.sort.SortOrder.DESC;
@Service @Service
@Slf4j
public class ZtryServiceImpl implements ZtryService { public class ZtryServiceImpl implements ZtryService {
@Resource @Resource
private RestHighLevelClient restHighLevelClient; private RestHighLevelClient restHighLevelClient;
...@@ -150,6 +152,27 @@ public class ZtryServiceImpl implements ZtryService { ...@@ -150,6 +152,27 @@ public class ZtryServiceImpl implements ZtryService {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("zhdwGajgjgdm", unitcode + "*"); WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("zhdwGajgjgdm", unitcode + "*");
bqXyr.must(wildcardQueryBuilder); bqXyr.must(wildcardQueryBuilder);
} }
//TODO 添加单位
if(ztry.isIfzttj()){
log.info("进行湖南单位统计");
if (ztry.isIfjcyla()){
log.info("非检察院立案");
TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery("ladwGajgjgdm", "990200000000" );
bqXyr.mustNot(termQueryBuilder);
}else {
log.info("检察院立案");
//and (hjdz_xzqhdm like '43%' or ladw_gajgjgdm like '43%')
BoolQueryBuilder should = QueryBuilders.boolQuery();
WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", "43*");
WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("ladwGajgjgdm", "43*");
should.should(hjdzXzqhdm);
should.should(ladwGajgjgdm);
bqXyr.must(should);
}
}
//上网单位 //上网单位
if (StringUtils.isNotEmpty(ztry.getDjspdwGajgjgdm())) { if (StringUtils.isNotEmpty(ztry.getDjspdwGajgjgdm())) {
String unitcode = ztry.getDjspdwGajgjgdm(); String unitcode = ztry.getDjspdwGajgjgdm();
...@@ -222,6 +245,7 @@ public class ZtryServiceImpl implements ZtryService { ...@@ -222,6 +245,7 @@ public class ZtryServiceImpl implements ZtryService {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("hjdzDzmc", "*" + ztry.getHjdzDzmc() + "*"); WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("hjdzDzmc", "*" + ztry.getHjdzDzmc() + "*");
bqXyr.must(wildcardQueryBuilder); bqXyr.must(wildcardQueryBuilder);
} }
System.out.println(bqXyr.toString()); System.out.println(bqXyr.toString());
return bqXyr; return bqXyr;
} }
...@@ -269,6 +293,7 @@ public class ZtryServiceImpl implements ZtryService { ...@@ -269,6 +293,7 @@ public class ZtryServiceImpl implements ZtryService {
}else { }else {
searchSourceBuilder.sort("xxrbksjRqsj.keyword",DESC).trackTotalHits(true); searchSourceBuilder.sort("xxrbksjRqsj.keyword",DESC).trackTotalHits(true);
} }
searchRequest.source(searchSourceBuilder); searchRequest.source(searchSourceBuilder);
try { try {
SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT); SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
......
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