Skip to content

X
xzxt-solr
Commit 797f0d09 by yanru
Options

修改受理单位作为查询条件，改为模糊查询

parent 26eec3fc
Showing with 36 additions and 49 deletions
src/main/java/com/cc/controller/SolrController.java
...@@ -8317,31 +8317,26 @@ public class SolrController { ...@@ -8317,31 +8317,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getXxdjdw_gajgjgdm().split(","); String[] arrs = asjRyRelateVO.getXxdjdw_gajgjgdm().split(",");
String mgs = " AND ("; String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) { for (int i = 0; i < arrs.length; i++) {
String xxdjdwGajgjgdm=arrs[i];
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
if (i < arrs.length - 1) { if (i < arrs.length - 1) {
if(arrs[i].indexOf("00000000")>0){ mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
mgs += "XXDJDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
}
} else { } else {
if(arrs[i].indexOf("00000000")>0){ mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
mgs += "XXDJDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
}
} }
} }
mgs += ")"; mgs += ")";
wzmstQ += mgs; wzmstQ += mgs;
}else{//单选 }else{//单选
if(asjRyRelateVO.getXxdjdw_gajgjgdm().indexOf("00000000")>0){ String xxdjdwGajgjgdm=asjRyRelateVO.getXxdjdw_gajgjgdm();
wzmstQ += "AND XXDJDW_GAJGJGDM:*" + asjRyRelateVO.getXxdjdw_gajgjgdm().substring(0,4) + "*"; if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
}else{ Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
wzmstQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getXxdjdw_gajgjgdm(); xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
} }
wzmstQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
} }
} }
if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){ if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){
...@@ -8621,30 +8616,26 @@ public class SolrController { ...@@ -8621,30 +8616,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getSldw_gajgjgdm().split(","); String[] arrs = asjRyRelateVO.getSldw_gajgjgdm().split(",");
String mgs = " AND ("; String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) { for (int i = 0; i < arrs.length; i++) {
String sldwGajgjgdm=arrs[i];
if(null!=sldwGajgjgdm && !"".equals(sldwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(sldwGajgjgdm);
sldwGajgjgdm=codeMap.get("ladwdm").toString();
}
if (i < arrs.length - 1) { if (i < arrs.length - 1) {
if(arrs[i].indexOf("00000000")>0){ mgs += "SLDW_GAJGJGDM:" + sldwGajgjgdm+"*" + " OR ";
mgs += "SLDW_GAJGJGDM:" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "SLDW_GAJGJGDM:" + arrs[i] + " OR ";
}
} else { } else {
if(arrs[i].indexOf("00000000")>0){ mgs += "SLDW_GAJGJGDM:" + sldwGajgjgdm+"*";
mgs += "SLDW_GAJGJGDM:" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "SLDW_GAJGJGDM:" + arrs[i];
}
} }
} }
mgs += ")"; mgs += ")";
jsasjQ += mgs; jsasjQ += mgs;
}else{//单选 }else{//单选
if(asjRyRelateVO.getSldw_gajgjgdm().indexOf("00000000")>0){ String sldwGajgjgdm=asjRyRelateVO.getSldw_gajgjgdm();
jsasjQ += "AND SLDW_GAJGJGDM:" + asjRyRelateVO.getSldw_gajgjgdm().substring(0,4) + "*"; if(null!=sldwGajgjgdm && !"".equals(sldwGajgjgdm)){
}else{ Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(sldwGajgjgdm);
jsasjQ += " AND SLDW_GAJGJGDM:"+asjRyRelateVO.getSldw_gajgjgdm(); sldwGajgjgdm=codeMap.get("ladwdm").toString();
} }
jsasjQ += " AND SLDW_GAJGJGDM:"+sldwGajgjgdm+"*";
} }
} }
...@@ -10398,30 +10389,26 @@ public class SolrController { ...@@ -10398,30 +10389,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getSldw_gajgjgdm().split(","); String[] arrs = asjRyRelateVO.getSldw_gajgjgdm().split(",");
String mgs = " AND ("; String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) { for (int i = 0; i < arrs.length; i++) {
String sldwGajgjgdm=arrs[i];
if(null!=sldwGajgjgdm && !"".equals(sldwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(sldwGajgjgdm);
sldwGajgjgdm=codeMap.get("ladwdm").toString();
}
if (i < arrs.length - 1) { if (i < arrs.length - 1) {
if(arrs[i].indexOf("00000000")>0){ mgs += " SLDW_GAJGJGDM:" + sldwGajgjgdm+"*" + " OR ";
mgs += "SLDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "SLDW_GAJGJGDM:" + arrs[i] + " OR ";
}
} else { } else {
if(arrs[i].indexOf("00000000")>0){ mgs += " SLDW_GAJGJGDM:" + sldwGajgjgdm+"*";
mgs += "SLDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "SLDW_GAJGJGDM:" + arrs[i];
}
} }
} }
mgs += ")"; mgs += ")";
jsasjQ += mgs; jsasjQ += mgs;
}else{//单选 }else{//单选
if(asjRyRelateVO.getSldw_gajgjgdm().indexOf("00000000")>0){ String sldwGajgjgdm=asjRyRelateVO.getSldw_gajgjgdm();
jsasjQ += "AND SLDW_GAJGJGDM:*" + asjRyRelateVO.getSldw_gajgjgdm().substring(0,4) + "*"; if(null!=sldwGajgjgdm && !"".equals(sldwGajgjgdm)){
}else{ Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(sldwGajgjgdm);
jsasjQ += " AND SLDW_GAJGJGDM:"+asjRyRelateVO.getSldw_gajgjgdm(); sldwGajgjgdm=codeMap.get("ladwdm").toString();
} }
jsasjQ += " AND SLDW_GAJGJGDM:"+sldwGajgjgdm+"*";
} }
} }
......
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