Skip to content

X
xzxt-solr
Commit 885b536d by xing_wang
Options

失踪人员未知名尸体查询调整

parent 13ca1414
Showing with 17 additions and 63 deletions
src/main/java/com/cc/controller/SolrController.java
......@@ -8296,37 +8296,11 @@ public class SolrController {
}
//登记单位
if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm() && !"".equals(asjRyRelateVO.getXxdjdw_gajgjgdm())){
//多选
if(asjRyRelateVO.getXxdjdw_gajgjgdm().indexOf(",") > 0){
String[] arrs = asjRyRelateVO.getXxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
if(arrs[i].indexOf("00000000")>0){
mgs += "XXDJDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
}
} else {
if(arrs[i].indexOf("00000000")>0){
mgs += "XXDJDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
}
}
}
mgs += ")";
wzmstQ += mgs;
}else{//单选
if(asjRyRelateVO.getXxdjdw_gajgjgdm().indexOf("00000000")>0){
wzmstQ += "AND XXDJDW_GAJGJGDM:*" + asjRyRelateVO.getXxdjdw_gajgjgdm().substring(0,4) + "*";
}else{
wzmstQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getXxdjdw_gajgjgdm();
}
String djdwGajgjgdm = CommonFunc.getDwLike(asjRyRelateVO.getXxdjdw_gajgjgdm(),1);
if(!djdwGajgjgdm.startsWith("(")){
djdwGajgjgdm = djdwGajgjgdm+"*";
}
wzmstQ += " AND XXDJDW_GAJGJGDM:"+djdwGajgjgdm;
}
if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){
if("null".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){
......@@ -8592,14 +8566,14 @@ public class SolrController {
jsasjQ += " AND FXASJDD_DZMC:*"+asjRyRelateVO.getJsasj_fxasjdd_dzmc()+"*";
}
//受理单位
/*if(null!=asjRyRelateVO.getSldw_gajgjgdm() && !"".equals(asjRyRelateVO.getSldw_gajgjgdm())){
if(null!=asjRyRelateVO.getSldw_gajgjgdm() && !"".equals(asjRyRelateVO.getSldw_gajgjgdm())){
String sldwGajgjgdm = CommonFunc.getDwLike(asjRyRelateVO.getSldw_gajgjgdm(),1);
if(!sldwGajgjgdm.startsWith("(")){
sldwGajgjgdm = sldwGajgjgdm+"*";
}
jsasjQ += " AND SLDW_GAJGJGDM:"+sldwGajgjgdm;
}*/
if(null!=asjRyRelateVO.getSldw_gajgjgdm() && !"".equals(asjRyRelateVO.getSldw_gajgjgdm())){
}
/*if(null!=asjRyRelateVO.getSldw_gajgjgdm() && !"".equals(asjRyRelateVO.getSldw_gajgjgdm())){
//多选
if(asjRyRelateVO.getSldw_gajgjgdm().indexOf(",") > 0){
String[] arrs = asjRyRelateVO.getSldw_gajgjgdm().split(",");
......@@ -8631,7 +8605,7 @@ public class SolrController {
}
}
}
}*/
//登记时间
if(null!=asjRyRelateVO.getJsasj_djsjKssj() && !"".equals(asjRyRelateVO.getJsasj_djsjKssj())){
if(null!=asjRyRelateVO.getJsasj_djsjJssj() && !"".equals(asjRyRelateVO.getJsasj_djsjJssj())) {
......@@ -8673,7 +8647,7 @@ public class SolrController {
}
if(StringUtils.isNotBlank(jsasjQ)){
String fq = "{!join fromIndex=TB_XW_JSASJ from=ID to=GLXX_XXZJBH}";
fq += jsasjQ.substring(5,jsasjQ.length());
fq += jsasjQ.substring(4,jsasjQ.length());
System.out.println(fq);
fqList.add(fq);
}
......@@ -8923,21 +8897,11 @@ public class SolrController {
}
//查明单位
if(null!=asjRyRelateVO.getCmdw_gajgjgdm() && !"".equals(asjRyRelateVO.getCmdw_gajgjgdm())){
if(asjRyRelateVO.getCmdw_gajgjgdm().indexOf(",") > 0){
String[] arrs = asjRyRelateVO.getCmdw_gajgjgdm().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
mgs += "CMDW_GAJGJGDM:" + arrs[i] + " OR ";
} else {
mgs += "CMDW_GAJGJGDM:" + arrs[i];
}
}
mgs += ")";
wzmstQ += mgs;
}else{
wzmstQ += " AND CMDW_GAJGJGDM:"+asjRyRelateVO.getCmdw_gajgjgdm();
String cmdwGajgjgdm = CommonFunc.getDwLike(asjRyRelateVO.getCmdw_gajgjgdm(),1);
if(!cmdwGajgjgdm.startsWith("(")){
cmdwGajgjgdm = cmdwGajgjgdm+"*";
}
wzmstQ += " AND CMDW_GAJGJGDM:"+cmdwGajgjgdm;
}
if(null!=asjRyRelateVO.getCmdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getCmdw_gajgjgdm_second())){
if("null".equals(asjRyRelateVO.getCmdw_gajgjgdm_second())){
......@@ -9910,21 +9874,11 @@ public class SolrController {
}
//信息登记单位代码
if(null!=asjRyRelateVO.getSzry_xxdjdw_gajgjgdm() && !"".equals(asjRyRelateVO.getSzry_xxdjdw_gajgjgdm())){
if(asjRyRelateVO.getSzry_xxdjdw_gajgjgdm().indexOf(",") > 0){
String[] arrs = asjRyRelateVO.getSzry_xxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
if (i < arrs.length - 1) {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
} else {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
}
}
mgs += ")";
szryQ += mgs;
}else{
szryQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getSzry_xxdjdw_gajgjgdm();
String djdwGajgjgdm = CommonFunc.getDwLike(asjRyRelateVO.getSzry_xxdjdw_gajgjgdm(),1);
if(!djdwGajgjgdm.startsWith("(")){
djdwGajgjgdm = djdwGajgjgdm+"*";
}
szryQ += " AND XXDJDW_GAJGJGDM:"+djdwGajgjgdm;
}
if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){
if("null".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){
......
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