Merge remote-tracking branch 'origin/dev_gansu' into dev_gansu

src/main/java/com/cc/controller/SolrController.java

@@ -3,6 +3,8 @@ package com.cc.controller;
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
+
+import com.alibaba.fastjson.JSONObject;
 import com.cc.model.AsjRyRelateVO;
 import com.cc.model.Record;
 import com.cc.model.User;
@@ -1566,7 +1568,11 @@ public class SolrController {
 		if(null!=asjRyRelateVO.getZczjywsjztmc() && !"".equals(asjRyRelateVO.getZczjywsjztmc())){
 			asjQ += " AND ZCZJYWSJZTMC:"+asjRyRelateVO.getZczjywsjztmc();
 		}
-		System.out.println(asjQ);
+		//作案动机代码
+		if(null!=asjRyRelateVO.getZadjdm() && !"".equals(asjRyRelateVO.getZadjdm())){
+			asjQ += " AND ZADJDM:"+asjRyRelateVO.getZadjdm();
+		}
+		System.out.println("案件的fq查询条件================"+asjQ);
 		fqList.add(asjQ);
 		String ryQ="";
 		if(null!=asjRyRelateVO.getAsjxgrybh() && !"".equals(asjRyRelateVO.getAsjxgrybh())){
@@ -2204,7 +2210,7 @@ public class SolrController {
 		if(StringUtils.isNotBlank(zhfzxyrQ)){
 			String fq = "{!join fromIndex=TB_XW_ZBFZXYR from=ASJBH to=ID}";
 			fq += zhfzxyrQ.substring(5,zhfzxyrQ.length());
-			System.out.println(fq);
+			System.out.println("案件关联犯罪嫌疑人fq查询条件==================="+fq);
 			fqList.add(fq);
 		}
 
@@ -4675,6 +4681,10 @@ public class SolrController {
 		if(null!=asjRyRelateVO.getZajyaq() && !"".equals(asjRyRelateVO.getZajyaq())){
 			asjQ += " AND keywords:"+asjRyRelateVO.getZajyaq();
 		}
+		//作案动机代码
+		if(null!=asjRyRelateVO.getZadjdm() && !"".equals(asjRyRelateVO.getZadjdm())){
+			asjQ += " AND ZADJDM:"+asjRyRelateVO.getZadjdm();
+		}
 		if(StringUtils.isNotBlank(asjQ)){
 			String fq = "{!join fromIndex=TB_ST_ASJ from=ID to=ASJBH}";
 			fq += asjQ.substring(5,asjQ.length());
@@ -5287,6 +5297,7 @@ public class SolrController {
 		configMap.put("zxajurl",configProperties.getProperty("zxaj.url"));
 		Map<String,Object> map = getBhrFqList(asjRyRelateVO);
 		List<String> fqList = (List<String>)map.get("fqList");
+		System.out.println("人案筛查查询被害人条件======"+JSONObject.toJSONString(fqList));
 		//Sorl查询
 		Record record = new Record();
 		record.setRybh_record(selectedCols);
@@ -7150,6 +7161,9 @@ public class SolrController {
 			System.out.println(str);
 			asjQ += " AND "+str;
 		}
+		if(null!=asjRyRelateVO.getZadjdm() && !"".equals(asjRyRelateVO.getZadjdm())){
+			asjQ += " AND ZADJDM:"+asjRyRelateVO.getZadjdm();
+		}
 		if(StringUtils.isNotBlank(asjQ)){
 			String fq = "{!join fromIndex=TB_ST_ASJ from=ID to=ASJBH}";
 			fq += asjQ.substring(5,asjQ.length());
@@ -8303,31 +8317,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) {
-						if(arrs[i].indexOf("00000000")>0){
-							mgs += "XXDJDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
-						}else{
-							mgs += "XXDJDW_GAJGJGDM:" + arrs[i] + " OR ";
-						}
-
+						mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*" + " OR ";
 					} else {
-						if(arrs[i].indexOf("00000000")>0){
-							mgs += "XXDJDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
-						}else{
-							mgs += "XXDJDW_GAJGJGDM:" + arrs[i];
-						}
-
+						mgs += " XXDJDW_GAJGJGDM:" + xxdjdwGajgjgdm+"*";
 					}
 				}
 				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 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())){
@@ -8607,30 +8616,26 @@ public class SolrController {
 				String[] arrs = asjRyRelateVO.getSldw_gajgjgdm().split(",");
 				String mgs = " AND (";
 				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(arrs[i].indexOf("00000000")>0){
-							mgs += "SLDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
-						}else{
-							mgs += "SLDW_GAJGJGDM:" + arrs[i] + " OR ";
-						}
-
+						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+"*";
 
 			}
 		}
@@ -9915,17 +9920,28 @@ public class SolrController {
 			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++) {
+					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 += ")";
 				szryQ += mgs;
 			}else{
-				szryQ += " 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();
+				}
+				szryQ += " AND XXDJDW_GAJGJGDM:"+xxdjdwGajgjgdm+"*";
 			}
 		}
 		if(null!=asjRyRelateVO.getXxdjdw_gajgjgdm_second() && !"".equals(asjRyRelateVO.getXxdjdw_gajgjgdm_second())){
@@ -10373,30 +10389,26 @@ public class SolrController {
 				String[] arrs = asjRyRelateVO.getSldw_gajgjgdm().split(",");
 				String mgs = " AND (";
 				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(arrs[i].indexOf("00000000")>0){
-							mgs += "SLDW_GAJGJGDM:*" + arrs[i].substring(0,4) + "* OR ";
-						}else{
-							mgs += "SLDW_GAJGJGDM:" + arrs[i] + " OR ";
-						}
-
+						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+"*";
 
 			}
 		}

src/main/java/com/cc/model/AsjRyRelateVO.java

@@ -146,6 +146,7 @@ public class AsjRyRelateVO {
     private String zuzdw_zbr_xm;
     private String zuzdw_xbr_xm1;
     private String zbgc;//侦办过程
+    private String zadjdm;//作案动机代码
     //侦查终结
     private String zczj_zxsj01;
     private String zczj_zxsj01_year;
@@ -5243,4 +5244,12 @@ public class AsjRyRelateVO {
     public void setSfbhcxaj(String sfbhcxaj) {
         this.sfbhcxaj = sfbhcxaj;
     }
+
+    public String getZadjdm() {
+        return zadjdm;
+    }
+
+    public void setZadjdm(String zadjdm) {
+        this.zadjdm = zadjdm;
+    }
 }

src/main/java/com/cc/service/impl/SolrServiceImpl.java

@@ -4109,9 +4109,10 @@ public class SolrServiceImpl implements SolrService {
                     mapResult.put("ysbqhszry_xzz_xzqhdmmc",solrDocument.get("YSBQHSZRY_XZZ_XZQHDMMC"));
                     mapResult.put("ysbqhszry_xzz_dzmc",solrDocument.get("YSBQHSZRY_XZZ_DZMC"));
                     mapResult.put("sjzt",solrDocument.get("SJZT"));
-                    mapResult.put("szry_xxdjdw_gajgjgdm", solrDocument.get("SZRY_XXDJDW_GAJGJGDM"));
+                    mapResult.put("sjztmc", solrDocument.get("SJZTMC"));
+                    mapResult.put("szry_xxdjdw_gajgjgdm", solrDocument.get("XXDJDW_GAJGJGDM"));
                     mapResult.put("szrydjsj", solrDocument.get("SZRYDJSJ"));
-                    mapResult.put("szry_xxdjdw_gajgmc", solrDocument.get("SZRY_XXDJDW_GAJGMC"));
+                    mapResult.put("szry_xxdjdw_gajgmc", solrDocument.get("XXDJDW_GAJGMC"));
                     mapResult.put("ryszdd_xzqhmc", solrDocument.get("RYSZDD_XZQHMC"));
                     mapResult.put("ryszdd_sacs_sacslbmc", solrDocument.get("RYSZDD_SACS_SACSLBMC"));
                     mapResult.put("ryszdd_sacs_sacslbdm", solrDocument.get("RYSZDD_SACS_SACSLBDM"));
@@ -4200,9 +4201,9 @@ public class SolrServiceImpl implements SolrService {
                     mapResult.put("ysbqhszry_xzz_xzqhdmmc",solrDocument.get("YSBQHSZRY_XZZ_XZQHDMMC"));
                     mapResult.put("ysbqhszry_xzz_dzmc",solrDocument.get("YSBQHSZRY_XZZ_DZMC"));
                     mapResult.put("sjzt",solrDocument.get("SJZT"));
-                    mapResult.put("szry_xxdjdw_gajgjgdm", solrDocument.get("SZRY_XXDJDW_GAJGJGDM"));
+                    mapResult.put("szry_xxdjdw_gajgjgdm", solrDocument.get("XXDJDW_GAJGJGDM"));
                     mapResult.put("szrydjsj", solrDocument.get("SZRYDJSJ"));
-                    mapResult.put("szry_xxdjdw_gajgmc", solrDocument.get("SZRY_XXDJDW_GAJGMC"));
+                    mapResult.put("szry_xxdjdw_gajgmc", solrDocument.get("XXDJDW_GAJGMC"));
                     mapResult.put("ryszdd_xzqhmc", solrDocument.get("RYSZDD_XZQHMC"));
                     mapResult.put("ryszdd_dzmc", solrDocument.get("RYSZDD_DZMC"));
                     mapResult.put("rysz_jyqk", solrDocument.get("RYSZ_JYQK"));

src/main/resources/jdbcconfig.properties

 
 #\u5185\u8499
 jdbc.driverClass=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:XZXT
+jdbc.url=jdbc:oracle:thin:@47.92.129.99:1600:orcl
 jdbc.user=XZXT
 jdbc.password=XZXT
 

src/main/resources/solr.properties

@@ -7,7 +7,7 @@ solrZyUrl=http://10.100.17.119:9041/solr/core1
 solrZyCxtj=keywords
 #\u9AD8\u4EAE\u5B57\u6BB5
 solrZyGlzd=AJMC SY_JYQK
-sorlAddress=http://localhost:9090/solr
+sorlAddress=http://localhost:9041/solr
 #----------------------\u8D44\u6E90\u6570\u636E-------------------------------------
 #\u8D44\u6E90\u6570\u636Elist
 #zylist=hcdpxx:\u706B\u8F66\u767B\u8BB0\u4FE1\u606F,lkdjxx:\u65C5\u5BA2\u767B\u8BB0\u4FE1\u606F,mhlkxx:\u6C11\u822A\u65C5\u5BA2\u4FE1\u606F,swryxx:\u4E0A\u7F51\u4EBA\u5458\u4FE1\u606F

src/main/webapp/macx.jsp

@@ -191,12 +191,15 @@
                                                     <tr>
                                                         <!--侦查终结业务数据状态,00呈请,01待审批,02审批通过,03审批未通过,04待撤销,05已撤销,06撤销未通过,07已上报,08上报失败-->
                                                         <td class="td_title">侦办过程：</td>
-                                                        <td colspan="5">
+                                                        <td colspan="3">
                                                             <input type="radio" class="radio-inline" name="zbgc" value="00" title="未认领">未认领
                                                             <input type="radio" class="radio-inline" name="zbgc" value="01" title="已认领">已认领
                                                             <input type="radio" class="radio-inline" name="zbgc" value="02" title="未补采" >未补采
                                                             <input type="radio" class="radio-inline" name="zbgc" value="03" title="已补采" >已补采
                                                         </td>
+                                                        <td class="td_title">作案动机：</td>
+                                                        <td><p class="code-w"><input type="text" id="zadjdm" name="zadjdm" showtype="code" class="val easyui-combotree"  data-options="codetype: 'queryTypeCode?type=CODE_ZADJ',multiple:true,method:'get',fit:true,textField : 'text', valueField : 'id'"/></p>
+                                                        </td>
                                                     </tr>
                                                     <tr>
                                                         <td class="td_title">案件状态：</td>
@@ -236,6 +239,7 @@
                                                         <td class="td_title">破案审批时间：</td>
                                                         <td><input id="pa_spsjkssj" name="pa_spsjkssj" order="1" type="text" showtype="date" showname="bhsj" class="Wdate" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'pa_spsjjssj\')}',dateFmt:'yyyy-MM-dd'})"/>
                                                             -<input id="pa_spsjjssj" name="pa_spsjjssj" order="2" type="text" showtype="date" showname="bhsj" class="Wdate" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'pa_spsjkssj\')}',dateFmt:'yyyy-MM-dd'})"/></td>
+
                                                     </tr>
                                                     </tbody></table>
                                             </div>

src/main/webapp/szrycx.jsp

@@ -720,7 +720,7 @@
                 '7':['ysbqhszry_lxdh','联系电话'],
                 '8':['ysbqhszry_tmtzms','体貌特征描述'],
                 '9':['ryszdd_sacs_sacslbmc','涉案场所类别'],
-
+                '10':['szry_xxdjdw_gajgmc','信息登记单位'],