Commit 6d836c75 by liu_xiaoxu

导出bug(1.空值显示null;2.案发、立案、侦查终结时间换行);简要案情导出

parent 4d529545
......@@ -51,7 +51,7 @@ public class SolrServiceImpl implements SolrService {
SolrQuery filterQuery = new SolrQuery();
solrParams.add("q",q);
solrParams.add("start", begin+"");
solrParams.add("rows", end+"");
solrParams.add("rows", end+"");
if(StringUtils.isNotBlank(sort) && sort.equals("AFSJ_DESC")){
solrParams.add("sort", sort.toUpperCase()+" "+order);
}else{
......@@ -70,7 +70,11 @@ public class SolrServiceImpl implements SolrService {
if(CollectionUtils.isNotEmpty(fqList)){
for(int i=0;i<fqList.size();i++){
filterQuery.addFilterQuery(fqList.get(i)); //遍历fqList,加入filterQuery,每个关联的core用一个fq
flag +=fqList.get(i)+" AND"+q; //将查询条件保存到flag中,传到前端,以便前端使用
if (q =="*:*") {
flag += fqList.get(i) + "&&&"; //将查询条件保存到flag中,传到前端,以便前端使用
}else{
flag += fqList.get(i) + " AND" +q;
}
}
}
// ======高亮设置===
......@@ -1051,11 +1055,31 @@ public class SolrServiceImpl implements SolrService {
mapResult.put("id", solrDocument.get("ID"));
mapResult.put("jzajbh", solrDocument.get("JZAJBH"));
mapResult.put("xckybh", solrDocument.get("XCKYBH"));
mapResult.put("ajlbdmmc", solrDocument.get("AJLBDMMC"));
mapResult.put("zatz_jyqkmc", solrDocument.get("ZATZ_JYQKMC"));
mapResult.put("zcjddm", solrDocument.get("ZCJDDM"));
mapResult.put("zcjdmc", solrDocument.get("ZCJDMC"));
mapResult.put("ajmc", solrDocument.get("AJMC"));
if(solrDocument.get("AJLBDMMC")!=null && solrDocument.get("AJLBDMMC")!="null") {
mapResult.put("ajlbdmmc", solrDocument.get("AJLBDMMC"));
}else{
mapResult.put("ajlbdmmc", "");
}
if(solrDocument.get("ZATZ_JYQKMC")!=null && solrDocument.get("ZATZ_JYQKMC")!="null") {
mapResult.put("zatz_jyqkmc", solrDocument.get("ZATZ_JYQKMC"));
}else{
mapResult.put("zatz_jyqkmc", "");
}
if(solrDocument.get("AJLBDMMC")!=null && solrDocument.get("AJLBDMMC")!="null") {
mapResult.put("ajlbdmmc", solrDocument.get("AJLBDMMC"));
}else{
mapResult.put("ajlbdmmc", "");
}
if(solrDocument.get("ZCJDMC")!=null && solrDocument.get("ZCJDMC")!="null") {
mapResult.put("zcjdmc", solrDocument.get("ZCJDMC"));
}else{
mapResult.put("zcjdmc", "");
}
if(solrDocument.get("AJMC")!=null && solrDocument.get("AJMC")!="null") {
mapResult.put("ajmc", solrDocument.get("AJMC"));
}else{
mapResult.put("ajmc", "");
}
String asjfssjAsjfskssj = (String) solrDocument.get("ASJFSSJ_ASJFSKSSJ");
if(null!=asjfssjAsjfskssj && !"".equals(asjfssjAsjfskssj)){
if(asjfssjAsjfskssj.length() > 19){
......@@ -1081,45 +1105,120 @@ public class SolrServiceImpl implements SolrService {
}
String larq=String.valueOf(solrDocument.get("LARQ"));
if("null"!=larq){
larq="</br>立案:"+ larq;
larq="\r\n"+"立案:"+ larq;
}else{
larq="";
}
String zczjsj=String.valueOf(solrDocument.get("ZCZJ_ZXSJ01"));
if("null"!=zczjsj){
zczjsj="</br>侦查终结:" + zczjsj;
zczjsj="\r\n"+"侦查终结:" + zczjsj;
}else{
zczjsj="";
}
String date ="";
date = asjfssjAsjfskssj + larq + zczjsj;
mapResult.put("ajxgsj", date);
mapResult.put("jyaq", solrDocument.get("JYAQ"));
mapResult.put("ladw_gajgmc", solrDocument.get("LADW_GAJGMC"));
mapResult.put("slsj", solrDocument.get("SLSJ"));
mapResult.put("asjfsdd_xzqhmc", solrDocument.get("ASJFSDD_XZQHMC"));
mapResult.put("asjfsdd_dzmc", solrDocument.get("ASJFSDD_DZMC"));
mapResult.put("ssjzrmby", solrDocument.get("SSJZRMBY"));
mapResult.put("sjcwjzrmby", solrDocument.get("SJCWJZRMBY"));
mapResult.put("asjssry_rs", solrDocument.get("ASJSSRY_RS"));
mapResult.put("asjswry_rs", solrDocument.get("ASJSWRY_RS"));
mapResult.put("laywsjztmc", solrDocument.get("LAYWSJZTMC"));
if(solrDocument.get("JYAQ")!=null && solrDocument.get("JYAQ")!="null") {
mapResult.put("jyaq", solrDocument.get("JYAQ"));
}else{
mapResult.put("jyaq", "");
}
if(solrDocument.get("LADW_GAJGMC")!=null && solrDocument.get("LADW_GAJGMC")!="null") {
mapResult.put("ladw_gajgmc", solrDocument.get("LADW_GAJGMC"));
}else{
mapResult.put("ladw_gajgmc", "");
}
if(solrDocument.get("SLSJ")!=null && solrDocument.get("SLSJ")!="null") {
mapResult.put("slsj", solrDocument.get("SLSJ"));
}else{
mapResult.put("slsj", "");
}
if(solrDocument.get("ASJFSDD_XZQHMC")!=null && solrDocument.get("ASJFSDD_XZQHMC")!="null") {
mapResult.put("asjfsdd_xzqhmc", solrDocument.get("ASJFSDD_XZQHMC"));
}else{
mapResult.put("asjfsdd_xzqhmc", "");
}
if(solrDocument.get("ASJFSDD_DZMC")!=null && solrDocument.get("ASJFSDD_DZMC")!="null") {
mapResult.put("asjfsdd_dzmc", solrDocument.get("ASJFSDD_DZMC"));
}else{
mapResult.put("asjfsdd_dzmc", "");
}
if(solrDocument.get("SSJZRMBY")!=null && solrDocument.get("SSJZRMBY")!="null") {
mapResult.put("ssjzrmby", solrDocument.get("SSJZRMBY"));
}else{
mapResult.put("ssjzrmby", "");
}
if(solrDocument.get("SJCWJZRMBY")!=null && solrDocument.get("SJCWJZRMBY")!="null") {
mapResult.put("sjcwjzrmby", solrDocument.get("SJCWJZRMBY"));
}else{
mapResult.put("sjcwjzrmby", "");
}
if(solrDocument.get("ASJSSRY_RS")!=null && solrDocument.get("ASJSSRY_RS")!="null") {
mapResult.put("sjcwjzrmby", solrDocument.get("ASJSSRY_RS"));
}else{
mapResult.put("sjcwjzrmby", "");
}
if(solrDocument.get("ASJSWRY_RS")!=null && solrDocument.get("ASJSWRY_RS")!="null") {
mapResult.put("asjswry_rs", solrDocument.get("ASJSWRY_RS"));
}else{
mapResult.put("asjswry_rs", "");
}
if(solrDocument.get("ASJSWRY_RS")!=null && solrDocument.get("ASJSWRY_RS")!="null") {
mapResult.put("laywsjztmc", solrDocument.get("LAYWSJZTMC"));
}else{
mapResult.put("laywsjztmc", "");
}
String lazt=String.valueOf(solrDocument.get("LAYWSJZTMC"));
String a=lazt.replaceAll("</br>","").replaceAll("null","");
String zczjzt=String.valueOf(solrDocument.get("ZCZJYWSJZTMC"));
String b=zczjzt.replaceAll("</br>","").replaceAll("null","");
String sjzt=a+b;
mapResult.put("sjzt", sjzt);
mapResult.put("zczjywsjztmc", solrDocument.get("ZCZJYWSJZTMC"));
mapResult.put("zzdwfzrXm", solrDocument.get("ZZDWFZR_XM"));
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("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
mapResult.put("zuzdw_zbr_xm", solrDocument.get("ZUZDW_ZBR_XM"));
mapResult.put("zuzdw_xbr_xm1", solrDocument.get("ZUZDW_XBR_XM1"));
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
mapResult.put("xxdjdw_gajgmc", solrDocument.get("XXDJDW_GAJGMC"));
if(solrDocument.get("ZCZJYWSJZTMC")!=null && solrDocument.get("ZCZJYWSJZTMC")!="null") {
mapResult.put("zczjywsjztmc", solrDocument.get("ZCZJYWSJZTMC"));
}else{
mapResult.put("zczjywsjztmc", "");
}
if(solrDocument.get("ZZDWFZR_XM")!=null && solrDocument.get("ZZDWFZR_XM")!="null") {
mapResult.put("zzdwfzrXm", solrDocument.get("ZZDWFZR_XM"));
}else{
mapResult.put("zzdwfzrXm", "");
}
if(solrDocument.get("ZUZDW_ZBR_XM")!=null && solrDocument.get("ZUZDW_ZBR_XM")!="null") {
mapResult.put("zuzdw_zbr_xm", solrDocument.get("ZUZDW_ZBR_XM"));
}else{
mapResult.put("zuzdw_zbr_xm", "");
}
if(solrDocument.get("ZUZDW_XBR_XM1")!=null && solrDocument.get("ZUZDW_XBR_XM1")!="null") {
mapResult.put("zuzdw_xbr_xm1", solrDocument.get("ZUZDW_XBR_XM1"));
}else{
mapResult.put("zuzdw_xbr_xm1", "");
}
if(solrDocument.get("ZUZDW_GAJGMC")!=null && solrDocument.get("ZUZDW_GAJGMC")!="null") {
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
}else{
mapResult.put("zuzdw_gajgmc", "");
}
if(solrDocument.get("ZUZDW_ZBR_XM")!=null && solrDocument.get("ZUZDW_ZBR_XM")!="null") {
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_ZBR_XM"));
}else{
mapResult.put("zuzdw_gajgmc", "");
}
if(solrDocument.get("ZUZDW_XBR_XM1")!=null && solrDocument.get("ZUZDW_XBR_XM1")!="null") {
mapResult.put("zuzdw_xbr_xm1", solrDocument.get("ZUZDW_XBR_XM1"));
}else{
mapResult.put("zuzdw_xbr_xm1", "");
}
if(solrDocument.get("ZUZDW_GAJGMC")!=null && solrDocument.get("ZUZDW_GAJGMC")!="null") {
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
}else{
mapResult.put("zuzdw_gajgmc", "");
}
if(solrDocument.get("XXDJDW_GAJGMC")!=null && solrDocument.get("XXDJDW_GAJGMC")!="null") {
mapResult.put("xxdjdw_gajgmc", solrDocument.get("XXDJDW_GAJGMC"));
}else{
mapResult.put("xxdjdw_gajgmc", "");
}
if(StringUtils.isNotBlank(ssdw) && (ssdw.startsWith("65") || ssdw.startsWith("66"))){
mapResult.put("ajzlbmc", solrDocument.get("AJZLBMC"));
mapResult.put("ajxzlbmc", solrDocument.get("AJXZLBMC"));
......@@ -2470,29 +2569,126 @@ public class SolrServiceImpl implements SolrService {
if(solrDocument != null){
Map<String, Object> mapResult = new HashMap<String, Object>();
mapResult.put("id", solrDocument.get("ID"));
mapResult.put("xm", solrDocument.get("ZHFZXYR_XM"));
mapResult.put("cyzj_zjhm",solrDocument.get("ZHFZXYR_CYZJ_ZJHM"));
mapResult.put("xbdmmc", solrDocument.get("ZHFZXYR_XBDMMC"));
mapResult.put("mzmc", solrDocument.get("ZHFZXYR_MZMC"));
mapResult.put("jgmc", solrDocument.get("ZHFZXYR_JGMC"));
mapResult.put("gjmc", solrDocument.get("ZHFZXYR_GJMC"));
mapResult.put("hjdz_xzqhmc",solrDocument.get("ZHFZXYR_HJDZ_XZQHMC"));
mapResult.put("xzz_xzqhmc",solrDocument.get("ZHFZXYR_XZZ_XZQHMC"));
mapResult.put("hjdz_dzmc",solrDocument.get("ZHFZXYR_HJDZ_DZMC"));
mapResult.put("xzz_dzmc", solrDocument.get("ZHFZXYR_XZZ_DZMC"));
mapResult.put("djsj", solrDocument.get("DJSJ"));
mapResult.put("csrq_rqgzxx", solrDocument.get("ZHFZXYR_CSRQ_RQGZXX"));
mapResult.put("asjbh", solrDocument.get("ASJBH"));
mapResult.put("zhfs_zhfsmc", solrDocument.get("ZHFS_ZHFSMC"));
mapResult.put("zhdd_xzqhmc", solrDocument.get("ZHDD_XZQHMC"));
mapResult.put("zhdd_dzmc", solrDocument.get("ZHDD_DZMC"));
mapResult.put("rydnabh", solrDocument.get("RYDNABH"));
mapResult.put("szzwbh", solrDocument.get("SZZWBH"));
mapResult.put("zuzdw_zbr_xm", solrDocument.get("ZUZDW_ZBR_XM"));
mapResult.put("zuzdw_gajgjgdm", solrDocument.get("ZUZDW_GAJGJGDM"));
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
mapResult.put("zhfzxyr_nld", solrDocument.get("ZHFZXYR_NLD"));
mapResult.put("zhfzxyr_nldmc", solrDocument.get("ZHFZXYR_NLDMC"));
if(solrDocument.get("ZHFZXYR_XM")!=null && solrDocument.get("ZHFZXYR_XM")!="null") {
mapResult.put("xm", solrDocument.get("ZHFZXYR_XM"));
}else{
mapResult.put("xm", "");
}
if(solrDocument.get("ZHFZXYR_FZXYRDAZTMC")!=null && solrDocument.get("ZHFZXYR_FZXYRDAZTMC")!="null") {
mapResult.put("zhfzxyr_fzxyrdaztmc",solrDocument.get("ZHFZXYR_FZXYRDAZTMC"));
}else{
mapResult.put("zhfzxyr_fzxyrdaztmc", "");
}
if(solrDocument.get("ZHFZXYR_CYZJ_ZJHM")!=null && solrDocument.get("ZHFZXYR_CYZJ_ZJHM")!="null") {
mapResult.put("cyzj_zjhm",solrDocument.get("ZHFZXYR_CYZJ_ZJHM"));
}else{
mapResult.put("cyzj_zjhm", "");
}
if(solrDocument.get("ZHFZXYR_XBDMMC")!=null && solrDocument.get("ZHFZXYR_XBDMMC")!="null") {
mapResult.put("xbdmmc", solrDocument.get("ZHFZXYR_XBDMMC"));
}else{
mapResult.put("xbdmmc", "");
}
if(solrDocument.get("ZHFZXYR_MZMC")!=null && solrDocument.get("ZHFZXYR_MZMC")!="null") {
mapResult.put("mzmc", solrDocument.get("ZHFZXYR_MZMC"));
}else{
mapResult.put("mzmc", "");
}
if(solrDocument.get("ZHFZXYR_JGMC")!=null && solrDocument.get("ZHFZXYR_JGMC")!="null") {
mapResult.put("jgmc", solrDocument.get("ZHFZXYR_JGMC"));
}else{
mapResult.put("jgmc", "");
}
if(solrDocument.get("ZHFZXYR_GJMC")!=null && solrDocument.get("ZHFZXYR_GJMC")!="null") {
mapResult.put("gjmc", solrDocument.get("ZHFZXYR_GJMC"));
}else{
mapResult.put("gjmc", "");
}
if(solrDocument.get("ZHFZXYR_HJDZ_XZQHMC")!=null && solrDocument.get("ZHFZXYR_HJDZ_XZQHMC")!="null") {
mapResult.put("hjdz_xzqhmc",solrDocument.get("ZHFZXYR_HJDZ_XZQHMC"));
}else{
mapResult.put("hjdz_xzqhmc", "");
}
if(solrDocument.get("ZHFZXYR_XZZ_XZQHMC")!=null && solrDocument.get("ZHFZXYR_XZZ_XZQHMC")!="null") {
mapResult.put("xzz_xzqhmc",solrDocument.get("ZHFZXYR_XZZ_XZQHMC"));
}else{
mapResult.put("xzz_xzqhmc", "");
}
if(solrDocument.get("ZHFZXYR_HJDZ_DZMC")!=null && solrDocument.get("ZHFZXYR_HJDZ_DZMC")!="null") {
mapResult.put("hjdz_dzmc",solrDocument.get("ZHFZXYR_HJDZ_DZMC"));
}else{
mapResult.put("hjdz_dzmc", "");
}
if(solrDocument.get("ZHFZXYR_XZZ_DZMC")!=null && solrDocument.get("ZHFZXYR_XZZ_DZMC")!="null") {
mapResult.put("xzz_dzmc", solrDocument.get("ZHFZXYR_XZZ_DZMC"));
}else{
mapResult.put("xzz_dzmc", "");
}
if(solrDocument.get("DJSJ")!=null && solrDocument.get("DJSJ")!="null") {
mapResult.put("djsj", solrDocument.get("DJSJ"));
}else{
mapResult.put("djsj", "");
}
if(solrDocument.get("ZHFZXYR_CSRQ_RQGZXX")!=null && solrDocument.get("ZHFZXYR_CSRQ_RQGZXX")!="null") {
mapResult.put("csrq_rqgzxx", solrDocument.get("ZHFZXYR_CSRQ_RQGZXX"));
}else{
mapResult.put("csrq_rqgzxx", "");
}
if(solrDocument.get("ASJBH")!=null && solrDocument.get("ASJBH")!="null") {
mapResult.put("asjbh", solrDocument.get("ASJBH"));
}else{
mapResult.put("asjbh", "");
}
if(solrDocument.get("ZHFS_ZHFSMC")!=null && solrDocument.get("ZHFS_ZHFSMC")!="null") {
mapResult.put("zhfs_zhfsmc", solrDocument.get("ZHFS_ZHFSMC"));
}else{
mapResult.put("zhfs_zhfsmc", "");
}
if(solrDocument.get("ZHDD_XZQHMC")!=null && solrDocument.get("ZHDD_XZQHMC")!="null") {
mapResult.put("zhdd_xzqhmc", solrDocument.get("ZHDD_XZQHMC"));
}else{
mapResult.put("zhdd_xzqhmc", "");
}
if(solrDocument.get("ZHDD_DZMC")!=null && solrDocument.get("ZHDD_DZMC")!="null") {
mapResult.put("zhdd_dzmc", solrDocument.get("ZHDD_DZMC"));
}else{
mapResult.put("zhdd_dzmc", "");
}
if(solrDocument.get("RYDNABH")!=null && solrDocument.get("RYDNABH")!="null") {
mapResult.put("rydnabh", solrDocument.get("RYDNABH"));
}else{
mapResult.put("rydnabh", "");
}
if(solrDocument.get("SZZWBH")!=null && solrDocument.get("SZZWBH")!="null") {
mapResult.put("szzwbh", solrDocument.get("SZZWBH"));
}else{
mapResult.put("szzwbh", "");
}
if(solrDocument.get("ZUZDW_ZBR_XM")!=null && solrDocument.get("ZUZDW_ZBR_XM")!="null") {
mapResult.put("zuzdw_zbr_xm", solrDocument.get("ZUZDW_ZBR_XM"));
}else{
mapResult.put("zuzdw_zbr_xm", "");
}
if(solrDocument.get("ZUZDW_GAJGJGDM")!=null && solrDocument.get("ZUZDW_GAJGJGDM")!="null") {
mapResult.put("zuzdw_gajgjgdm", solrDocument.get("ZUZDW_GAJGJGDM"));
}else{
mapResult.put("zuzdw_gajgjgdm", "");
}
if(solrDocument.get("ZUZDW_GAJGMC")!=null && solrDocument.get("ZUZDW_GAJGMC")!="null") {
mapResult.put("zuzdw_gajgmc", solrDocument.get("ZUZDW_GAJGMC"));
}else{
mapResult.put("zuzdw_gajgmc", "");
}
if(solrDocument.get("ZHFZXYR_NLD")!=null && solrDocument.get("ZHFZXYR_NLD")!="null") {
mapResult.put("zhfzxyr_nld", solrDocument.get("ZHFZXYR_NLD"));
}else{
mapResult.put("zhfzxyr_nld", "");
}
if(solrDocument.get("ZHFZXYR_NLDMC")!=null && solrDocument.get("ZHFZXYR_NLDMC")!="null") {
mapResult.put("zhfzxyr_nldmc", solrDocument.get("ZHFZXYR_NLDMC"));
}else{
mapResult.put("zhfzxyr_nldmc", "");
}
xyrxxList.add(mapResult);
}
}
......@@ -3143,23 +3339,91 @@ public class SolrServiceImpl implements SolrService {
if(solrDocument != null){
Map<String, Object> mapResult = new HashMap<String, Object>();
mapResult.put("id", solrDocument.get("ID"));
mapResult.put("xm", solrDocument.get("BHR_XM"));
mapResult.put("cyzj_zjhm",solrDocument.get("BHR_CYZJ_ZJHM"));
mapResult.put("xbdmmc", solrDocument.get("BHR_XBDMMC"));
mapResult.put("mzmc", solrDocument.get("BHR_MZMC"));
mapResult.put("jgmc", solrDocument.get("BHR_JGMC"));
mapResult.put("gjmc", solrDocument.get("BHR_GJMC"));
mapResult.put("hjdz_xzqhmc",solrDocument.get("BHR_HJDZ_XZQHMC"));
mapResult.put("xzz_xzqhmc",solrDocument.get("BHR_XZZ_XZQHMC"));
mapResult.put("hjdz_dzmc",solrDocument.get("BHR_HJDZ_DZMC"));
mapResult.put("xzz_dzmc", solrDocument.get("BHR_XZZ_DZMC"));
mapResult.put("djsj", solrDocument.get("DJSJ"));
mapResult.put("csrq_rqgzxx", solrDocument.get("BHR_CSRQ_RQGZXX"));
mapResult.put("asjbh", solrDocument.get("ASJBH"));
mapResult.put("rsqfjgmc",solrDocument.get("RSQFJGMC"));
mapResult.put("rsshcdmc", solrDocument.get("RSSHCDMC"));
mapResult.put("rydnabh", solrDocument.get("RYDNABH"));
mapResult.put("szzwbh", solrDocument.get("SZZWBH"));
if(solrDocument.get("BHR_XM")!=null && solrDocument.get("BHR_XM")!="null") {
mapResult.put("xm", solrDocument.get("BHR_XM"));
}else{
mapResult.put("xm", "");
}
if(solrDocument.get("BHR_CYZJ_ZJHM")!=null && solrDocument.get("BHR_CYZJ_ZJHM")!="null") {
mapResult.put("cyzj_zjhm",solrDocument.get("BHR_CYZJ_ZJHM"));
}else{
mapResult.put("cyzj_zjhm", "");
}
if(solrDocument.get("BHR_XBDMMC")!=null && solrDocument.get("BHR_XBDMMC")!="null") {
mapResult.put("xbdmmc", solrDocument.get("BHR_XBDMMC"));
}else{
mapResult.put("xbdmmc", "");
}
if(solrDocument.get("BHR_MZMC")!=null && solrDocument.get("BHR_MZMC")!="null") {
mapResult.put("mzmc", solrDocument.get("BHR_MZMC"));
}else{
mapResult.put("mzmc", "");
}
if(solrDocument.get("BHR_JGMC")!=null && solrDocument.get("BHR_JGMC")!="null") {
mapResult.put("jgmc", solrDocument.get("BHR_JGMC"));
}else{
mapResult.put("jgmc", "");
}
if(solrDocument.get("BHR_GJMC")!=null && solrDocument.get("BHR_GJMC")!="null") {
mapResult.put("gjmc", solrDocument.get("BHR_GJMC"));
}else{
mapResult.put("gjmc", "");
}
if(solrDocument.get("BHR_HJDZ_XZQHMC")!=null && solrDocument.get("BHR_HJDZ_XZQHMC")!="null") {
mapResult.put("hjdz_xzqhmc",solrDocument.get("BHR_HJDZ_XZQHMC"));
}else{
mapResult.put("hjdz_xzqhmc", "");
}
if(solrDocument.get("BHR_XZZ_XZQHMC")!=null && solrDocument.get("BHR_XZZ_XZQHMC")!="null") {
mapResult.put("xzz_xzqhmc",solrDocument.get("BHR_XZZ_XZQHMC"));
}else{
mapResult.put("xzz_xzqhmc", "");
}
if(solrDocument.get("BHR_HJDZ_DZMC")!=null && solrDocument.get("BHR_HJDZ_DZMC")!="null") {
mapResult.put("hjdz_dzmc",solrDocument.get("BHR_HJDZ_DZMC"));
}else{
mapResult.put("hjdz_dzmc", "");
}
if(solrDocument.get("BHR_XZZ_DZMC")!=null && solrDocument.get("BHR_XZZ_DZMC")!="null") {
mapResult.put("xzz_dzmc", solrDocument.get("BHR_XZZ_DZMC"));
}else{
mapResult.put("xzz_dzmc", "");
}
if(solrDocument.get("DJSJ")!=null && solrDocument.get("DJSJ")!="null") {
mapResult.put("djsj", solrDocument.get("DJSJ"));
}else{
mapResult.put("djsj", "");
}
if(solrDocument.get("BHR_CSRQ_RQGZXX")!=null && solrDocument.get("BHR_CSRQ_RQGZXX")!="null") {
mapResult.put("csrq_rqgzxx", solrDocument.get("BHR_CSRQ_RQGZXX"));
}else{
mapResult.put("csrq_rqgzxx", "");
}
if(solrDocument.get("ASJBH")!=null && solrDocument.get("ASJBH")!="null") {
mapResult.put("asjbh", solrDocument.get("ASJBH"));
}else{
mapResult.put("asjbh", "");
}
if(solrDocument.get("RSQFJGMC")!=null && solrDocument.get("RSQFJGMC")!="null") {
mapResult.put("rsqfjgmc",solrDocument.get("RSQFJGMC"));
}else{
mapResult.put("rsqfjgmc", "");
}
if(solrDocument.get("RSSHCDMC")!=null && solrDocument.get("RSSHCDMC")!="null") {
mapResult.put("rsshcdmc", solrDocument.get("RSSHCDMC"));
}else{
mapResult.put("rsshcdmc", "");
}
if(solrDocument.get("RYDNABH")!=null && solrDocument.get("RYDNABH")!="null") {
mapResult.put("rydnabh", solrDocument.get("RYDNABH"));
}else{
mapResult.put("rydnabh", "");
}
if(solrDocument.get("SZZWBH")!=null && solrDocument.get("SZZWBH")!="null") {
mapResult.put("szzwbh", solrDocument.get("SZZWBH"));
}else{
mapResult.put("szzwbh", "");
}
bhrxxList.add(mapResult);
}
}
......@@ -3338,7 +3602,7 @@ public class SolrServiceImpl implements SolrService {
String groupid = arr[i];
if(arr[i].indexOf("WZMST_XXDJDW_GAJGJGDM")==0){
groupid = arr[i].replaceFirst("WZMST_", "");
groupid = arr[i].replaceFirst("WZMST_", "");
}
if(arr[i].indexOf("WZMST_DJSJ")==0){
groupid = arr[i].replaceFirst("WZMST_", "");
......
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