Commit 685e9ef2 by xing_wang

兵团添加案发地管辖派出所

parent 91e94e7e
......@@ -816,6 +816,9 @@ public class SolrController {
if(null!=asjRyRelateVO.getZuzdw_xbr_xm1() && !"".equals(asjRyRelateVO.getZuzdw_xbr_xm1())){
asjQ += " AND ZUZDW_XBR_XM1:*"+asjRyRelateVO.getZuzdw_xbr_xm1()+"*";
}
if(null!=asjRyRelateVO.getAsjfsdd_gxpcs() && !"".equals(asjRyRelateVO.getAsjfsdd_gxpcs())){
asjQ += " AND ASJFSDD_GXPCS:*"+asjRyRelateVO.getAsjfsdd_gxpcs()+"*";
}
if(null!=asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz() && !"".equals(asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz())){
asjQ += " AND ASJFSDD_SFJZWN_PDBZ:"+asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz();
......@@ -4309,7 +4312,9 @@ public class SolrController {
if(null!=asjRyRelateVO.getZuzdw_xbr_xm1() && !"".equals(asjRyRelateVO.getZuzdw_xbr_xm1())){
asjQ += " AND ZUZDW_XBR_XM1:*"+asjRyRelateVO.getZuzdw_xbr_xm1()+"*";
}
if(null!=asjRyRelateVO.getAsjfsdd_gxpcs() && !"".equals(asjRyRelateVO.getAsjfsdd_gxpcs())){
asjQ += " AND ASJFSDD_GXPCS:*"+asjRyRelateVO.getAsjfsdd_gxpcs()+"*";
}
if(null!=asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz() && !"".equals(asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz())){
asjQ += " AND ASJFSDD_SFJZWN_PDBZ:"+asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz();
}
......@@ -6830,7 +6835,9 @@ public class SolrController {
if(null!=asjRyRelateVO.getZuzdw_xbr_xm1() && !"".equals(asjRyRelateVO.getZuzdw_xbr_xm1())){
asjQ += " AND ZUZDW_XBR_XM1:*"+asjRyRelateVO.getZuzdw_xbr_xm1()+"*";
}
if(null!=asjRyRelateVO.getAsjfsdd_gxpcs() && !"".equals(asjRyRelateVO.getAsjfsdd_gxpcs())){
asjQ += " AND ASJFSDD_GXPCS:*"+asjRyRelateVO.getAsjfsdd_gxpcs()+"*";
}
if(null!=asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz() && !"".equals(asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz())){
asjQ += " AND ASJFSDD_SFJZWN_PDBZ:"+asjRyRelateVO.getAsjfsdd_sfjzwn_pdbz();
}
......
......@@ -145,6 +145,7 @@ public class AsjRyRelateVO {
private String jrjzkjfsjsd_jrjzkjfsjsdmc;
private String zuzdw_zbr_xm;
private String zuzdw_xbr_xm1;
private String asjfsdd_gxpcs;//案事件发生地点管辖派出所(兵团)
private String zbgc;//侦办过程
//侦查终结
private String zczj_zxsj01;
......@@ -2150,6 +2151,14 @@ public class AsjRyRelateVO {
this.zuzdw_xbr_xm1 = zuzdw_xbr_xm1;
}
public String getAsjfsdd_gxpcs() {
return asjfsdd_gxpcs;
}
public void setAsjfsdd_gxpcs(String asjfsdd_gxpcs) {
this.asjfsdd_gxpcs = asjfsdd_gxpcs;
}
public String getAsjfsdd_sfjzwn_pdbz() {
return asjfsdd_sfjzwn_pdbz;
}
......
......@@ -219,6 +219,7 @@ public class SolrServiceImpl implements SolrService {
mapResult.put("zzdwfzr_xm", solrDocument.get("ZZDWFZR_XM"));
mapResult.put("zuzdw_zbr_xm", solrDocument.get("ZUZDW_ZBR_XM"));
mapResult.put("zuzdw_xbr_xm1", solrDocument.get("ZUZDW_XBR_XM1"));
mapResult.put("asjfsdd_gxpcs", solrDocument.get("ASJFSDD_GXPCS"));
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
mapResult.put("xxdjdw_gajgmc", solrDocument.get("XXDJDW_GAJGMC"));
if(StringUtils.isNotBlank(unitcode) && (unitcode.substring(0,2).startsWith("65") || unitcode.substring(0,2).startsWith("66"))){
......@@ -1227,6 +1228,11 @@ public class SolrServiceImpl implements SolrService {
}else{
mapResult.put("zuzdw_xbr_xm1", "");
}
if(solrDocument.get("ASJFSDD_GXPCS")!=null && solrDocument.get("ASJFSDD_GXPCS")!="null") {
mapResult.put("asjfsdd_gxpcs", solrDocument.get("ASJFSDD_GXPCS"));
}else{
mapResult.put("asjfsdd_gxpcs", "");
}
if(solrDocument.get("ZUZDW_GAJGMC")!=null && solrDocument.get("ZUZDW_GAJGMC")!="null") {
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
}else{
......@@ -6176,6 +6182,7 @@ public class SolrServiceImpl implements SolrService {
mapResult.put("zzdwfzr_xm", solrDocument.get("ZZDWFZR_XM"));
mapResult.put("zuzdw_zbr_xm", solrDocument.get("ZUZDW_ZBR_XM"));
mapResult.put("zuzdw_xbr_xm1", solrDocument.get("ZUZDW_XBR_XM1"));
mapResult.put("asjfsdd_gxpcs", solrDocument.get("ASJFSDD_GXPCS"));
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
mapResult.put("xxdjdw_gajgmc", solrDocument.get("XXDJDW_GAJGMC"));
mapResult.put("asjfssj_asjfskssj", solrDocument.get("ASJFSSJ_ASJFSKSSJ"));
......
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