Skip to content

X
xzxt-solr
Commit 7ac2c2ec by yanru
Options

修改关于单位的相关查询

parent a9bfe2ac
Showing with 135 additions and 85 deletions
src/main/java/com/cc/controller/SolrController.java
......@@ -2100,16 +2100,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
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) {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
} else {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
}
}
mgs += ")";
zhfzxyrQ += mgs;
}else{
zhfzxyrQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm();
String xxdjdwGajgjgdm=asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm();
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
zhfzxyrQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
}
}
if(null!=asjRyRelateVO.getZhfzxyr_tzxx() && !"".equals(asjRyRelateVO.getZhfzxyr_tzxx())){
......@@ -4664,16 +4674,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
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) {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
} else {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
}
}
mgs += ")";
zhfzxyrQ += mgs;
}else{
zhfzxyrQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm();
String xxdjdwGajgjgdm=asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm();
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
zhfzxyrQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
}
}
if(null!=asjRyRelateVO.getZhfzxyr_tzxx() && !"".equals(asjRyRelateVO.getZhfzxyr_tzxx())){
......@@ -6382,16 +6402,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
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) {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
} else {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
}
}
mgs += ")";
ryQ += mgs;
}else{
ryQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm();
String xxdjdwGajgjgdm=asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm();
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
ryQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
}
}
if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){
......@@ -9022,16 +9052,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
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) {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
} else {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
}
}
mgs += ")";
zbfzxyrQ += mgs;
}else{
zbfzxyrQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm();
String xxdjdwGajgjgdm=asjRyRelateVO.getZhfzxyr_xxdjdw_gajgjgdm();
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
zbfzxyrQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
}
}
......@@ -11256,39 +11296,6 @@ public class SolrController {
}
jsasjQ += " AND SLDW_GAJGJGDM:"+sldwGajgjgdm;
}
/*if(null!=asjRyRelateVO.getSldw_gajgjgdm() && !"".equals(asjRyRelateVO.getSldw_gajgjgdm())){
//多选
if(asjRyRelateVO.getSldw_gajgjgdm().indexOf(",") > 0){
String[] arrs = asjRyRelateVO.getSldw_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 += "SLDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "SLDW_GAJGJGDM:" + arrs[i] + " OR ";
}
} else {
if(arrs[i].indexOf("00000000")>0){
mgs += "SLDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "SLDW_GAJGJGDM:" + arrs[i];
}
}
}
mgs += ")";
jsasjQ += mgs;
}else{//单选
if(asjRyRelateVO.getSldw_gajgjgdm().indexOf("00000000")>0){
jsasjQ += "AND SLDW_GAJGJGDM:*" + asjRyRelateVO.getSldw_gajgjgdm().substring(0,4) + "*";
}else{
jsasjQ += " AND SLDW_GAJGJGDM:"+asjRyRelateVO.getSldw_gajgjgdm();
}
}
}*/
//登记时间
if(null!=asjRyRelateVO.getJsasj_djsjKssj() && !"".equals(asjRyRelateVO.getJsasj_djsjKssj())){
if(null!=asjRyRelateVO.getJsasj_djsjJssj() && !"".equals(asjRyRelateVO.getJsasj_djsjJssj())) {
......@@ -11710,16 +11717,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getCmcx_xxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
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) {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
} else {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
}
}
mgs += ")";
wzmstQ += mgs;
}else{
wzmstQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getCmcx_xxdjdw_gajgjgdm();
String xxdjdwGajgjgdm=asjRyRelateVO.getCmcx_xxdjdw_gajgjgdm();
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
wzmstQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
}
}
System.out.println(wzmstQ);
......@@ -11998,7 +12015,12 @@ public class SolrController {
if("null".equals(asjRyRelateVO.getSzry_xxdjdw_gajgjgdm())){
szrycsQ += " AND -XXDJDW_GAJGJGDM:*";
}else{
szrycsQ += " AND XXDJDW_GAJGJGDM:*"+asjRyRelateVO.getSzry_xxdjdw_gajgjgdm()+"*";
String xxdjdwGajgjgdm=asjRyRelateVO.getSzry_xxdjdw_gajgjgdm();
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
szrycsQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
}
}
//登记时间
......@@ -12158,16 +12180,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getCmdw_gajgjgdm().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
String cmdwGajgjgdm=arrs[i];
if(null!=cmdwGajgjgdm && !"".equals(cmdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(cmdwGajgjgdm);
cmdwGajgjgdm=codeMap.get("ladwdm").toString();
}
if (i < arrs.length - 1) {
mgs += "CMDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " CMDW_GAJGJGDM:" + cmdwGajgjgdm+"*" + " OR ";
} else {
mgs += "CMDW_GAJGJGDM:" + arrs[i];
mgs += " CMDW_GAJGJGDM:" + cmdwGajgjgdm+"*";
}
}
mgs += ")";
szrycsQ += mgs;
}else{
szrycsQ += " AND CMDW_GAJGJGDM:"+asjRyRelateVO.getCmdw_gajgjgdm();
String cmdwGajgjgdm=asjRyRelateVO.getCmdw_gajgjgdm();
if(null!=cmdwGajgjgdm && !"".equals(cmdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(cmdwGajgjgdm);
cmdwGajgjgdm=codeMap.get("ladwdm").toString();
}
szrycsQ += " AND CMDW_GAJGJGDM:"+cmdwGajgjgdm+"*";
}
}
......@@ -12199,16 +12231,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getCmdw_gajgjgdm().split(",");
String mgs = " AND (";
for (int i = 0; i < arrs.length; i++) {
String cmdwGajgjgdm=arrs[i];
if(null!=cmdwGajgjgdm && !"".equals(cmdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(cmdwGajgjgdm);
cmdwGajgjgdm=codeMap.get("ladwdm").toString();
}
if (i < arrs.length - 1) {
mgs += "CMDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " CMDW_GAJGJGDM:" + cmdwGajgjgdm+"*" + " OR ";
} else {
mgs += "CMDW_GAJGJGDM:" + arrs[i];
mgs += " CMDW_GAJGJGDM:" + cmdwGajgjgdm+"*";
}
}
mgs += ")";
szrycsQ += mgs;
}else{
szrycsQ += " AND CMDW_GAJGJGDM:"+asjRyRelateVO.getCmdw_gajgjgdm();
String cmdwGajgjgdm=asjRyRelateVO.getCmdw_gajgjgdm();
if(null!=cmdwGajgjgdm && !"".equals(cmdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(cmdwGajgjgdm);
cmdwGajgjgdm=codeMap.get("ladwdm").toString();
}
szrycsQ += " AND CMDW_GAJGJGDM:"+cmdwGajgjgdm+"*";
}
}
if(null!=asjRyRelateVO.getCmdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getCmdw_gajgjgdm_second())){
......@@ -12255,16 +12297,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getXxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
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) {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
} else {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
}
}
mgs += ")";
szrycsQ += mgs;
}else{
szrycsQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getXxdjdw_gajgjgdm();
String xxdjdwGajgjgdm=asjRyRelateVO.getXxdjdw_gajgjgdm();
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
szrycsQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
}
}
if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){
......@@ -12994,44 +13046,32 @@ public class SolrController {
jsasjQ += " AND XBR_LXDH:*"+asjRyRelateVO.getXbr_lxdh()+"*";
}
//受理单位
/*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(asjRyRelateVO.getSldw_gajgjgdm().indexOf(",") > 0){
String[] arrs = asjRyRelateVO.getSldw_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 += "SLDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "SLDW_GAJGJGDM:" + arrs[i] + " OR ";
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) {
mgs += " SLDW_GAJGJGDM:" + sldwGajgjgdm+"*" + " OR ";
} else {
if(arrs[i].indexOf("00000000")>0){
mgs += "SLDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
}else{
mgs += "SLDW_GAJGJGDM:" + arrs[i];
}
mgs += " SLDW_GAJGJGDM:" + sldwGajgjgdm+"*";
}
}
mgs += ")";
jsasjQ += mgs;
}else{//单选
if(asjRyRelateVO.getSldw_gajgjgdm().indexOf("00000000")>0){
jsasjQ += "AND SLDW_GAJGJGDM:*" + asjRyRelateVO.getSldw_gajgjgdm().substring(0,4) + "*";
}else{
jsasjQ += " AND SLDW_GAJGJGDM:"+asjRyRelateVO.getSldw_gajgjgdm();
String sldwGajgjgdm=asjRyRelateVO.getSldw_gajgjgdm();
if(null!=sldwGajgjgdm && !"".equals(sldwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(sldwGajgjgdm);
sldwGajgjgdm=codeMap.get("ladwdm").toString();
}
jsasjQ += " AND SLDW_GAJGJGDM:"+sldwGajgjgdm+"*";
}
}
......@@ -13190,16 +13230,26 @@ public class SolrController {
String[] arrs = asjRyRelateVO.getXxdjdw_gajgjgdm().split(",");
String mgs = " AND (";
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) {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
} else {
mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
}
}
mgs += ")";
wzmstQ += mgs;
}else{
wzmstQ += " AND XXDJDW_GAJGJGDM:"+asjRyRelateVO.getXxdjdw_gajgjgdm();
String xxdjdwGajgjgdm=asjRyRelateVO.getXxdjdw_gajgjgdm();
if(null!=xxdjdwGajgjgdm && !"".equals(xxdjdwGajgjgdm)){
Map<String,Object> codeMap = CodeUtils.getLadwAndMyCodeByGajgdm(xxdjdwGajgjgdm);
xxdjdwGajgjgdm=codeMap.get("ladwdm").toString();
}
wzmstQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
}
}
if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm_second() && !"".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