增加作案动机代码的查询条件

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());

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/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>