Skip to content

X
xzxt-api-report
Commit 278e1887 by liulianglang
Options

ssdw修改

parent 17fee425
Showing with 22 additions and 10 deletions
src/main/java/com/founder/service/impl/ZtryServiceImpl.java
......@@ -75,10 +75,10 @@ public class ZtryServiceImpl implements ZtryService {
if ("0".equals(ztry.getBdhj())) {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", ztry.getSsdw()+"*");
bqXyr.must(wildcardQueryBuilder);
} else if ("1".equals(ztry.getBdhj())) {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", ztry.getSsdw()+"*");
bqXyr.mustNot(wildcardQueryBuilder);
}
}
......@@ -361,8 +361,8 @@ public class ZtryServiceImpl implements ZtryService {
if(ztry.isIfbszttj()){
BoolQueryBuilder should = QueryBuilders.boolQuery();
WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", "43*");
WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", ztry.getSsdw()+"*");
WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", ztry.getSsdw()+"*");
should.should(hjdzXzqhdm);
should.should(ladwGajgjgdm);
bqXyr.must(should);
......@@ -468,10 +468,10 @@ public class ZtryServiceImpl implements ZtryService {
if ("0".equals(ztry.getBdhj())) {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", ztry.getSsdw()+"*");
bqXyr.must(wildcardQueryBuilder);
} else if ("1".equals(ztry.getBdhj())) {
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
WildcardQueryBuilder wildcardQueryBuilder = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", ztry.getSsdw()+"*");
bqXyr.mustNot(wildcardQueryBuilder);
}
}
......@@ -625,8 +625,8 @@ public class ZtryServiceImpl implements ZtryService {
}
if(ztry.isIfbszttj()){
BoolQueryBuilder should = QueryBuilders.boolQuery();
WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", "43*");
WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", "43*");
WildcardQueryBuilder hjdzXzqhdm = QueryBuilders.wildcardQuery("hjdzXzqhdm", ztry.getSsdw()+"*");
WildcardQueryBuilder ladwGajgjgdm = QueryBuilders.wildcardQuery("xxdjdwGajgjgdm", ztry.getSsdw()+"*");
should.should(hjdzXzqhdm);
should.should(ladwGajgjgdm);
bqXyr.must(should);
......@@ -733,7 +733,8 @@ public class ZtryServiceImpl implements ZtryService {
SearchRequest searchRequest = new SearchRequest();
BoolQueryBuilder boolQueryBuilder=new BoolQueryBuilder();
if("2".equals(ztry.getFxtjCx())){
String ssdw="430000000000";
// String ssdw="430000000000";
String ssdw=ztry.getSsdw();
String ztssdw = ssdw.substring(0,4);
if(ssdw.endsWith("0000000000")){
ztssdw = ssdw.substring(0,2);
......@@ -786,6 +787,16 @@ public class ZtryServiceImpl implements ZtryService {
}
boolQueryBuilder=getBoolZtryfxTjCount(ztry);
}else{
String ssdw=ztry.getSsdw();
if(StringUtils.isNotEmpty(ssdw)){
String ztssdw = ssdw.substring(0,4);
if(ssdw.endsWith("0000000000")){
ztssdw = ssdw.substring(0,2);
}
ztry.setSsdw(ztssdw);
}
boolQueryBuilder=getBoolZtry(ztry);
}
......@@ -936,7 +947,8 @@ public class ZtryServiceImpl implements ZtryService {
@Override
public Map<String, Object> doAnalyseZtry(ZtryParam ztryParam) {
String ssdw="430000000000";
// String ssdw="430000000000";
String ssdw=ztryParam.getSsdw();
String ztssdw = ssdw.substring(0,4);
if(ssdw.endsWith("0000000000")){
ztssdw = ssdw.substring(0,2);
......
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