命案修改

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

@@ -1421,7 +1421,7 @@ public class SolrController {
 			}
 
 		}
-		if(null!=asjRyRelateVO.getSfbhcxaj() && !"".equals(asjRyRelateVO.getSfbhcxaj())){
+		/*if(null!=asjRyRelateVO.getSfbhcxaj() && !"".equals(asjRyRelateVO.getSfbhcxaj())){
 			if("05".equals(asjRyRelateVO.getSfbhcxaj())){
 				asjQ += " OR LAYWSJZT:05";
 			}else{
@@ -1511,6 +1511,56 @@ public class SolrController {
 			}
 
 
+		}*/
+		//数据状态要多选，特殊处理
+		String laywsjzt01 = null;
+		String laywsjzt02 = null;
+		String laywsjzt07 = null;
+		String laywsjzt05 = null;
+		String zczjywsjzt01 =null;
+		String zczjywsjzt02 =null;
+		String zczjywsjzt07 =null;
+		String zczjywsjzt =null;
+		if(null!=asjRyRelateVO.getSfbhcxaj() && !"".equals(asjRyRelateVO.getSfbhcxaj())){
+			laywsjzt05="05";
+		}
+		if(null!=asjRyRelateVO.getZczjywsjzt01()){
+			zczjywsjzt01="01";
+		}
+		if(null!=asjRyRelateVO.getZczjywsjzt02()){
+			zczjywsjzt02="02";
+		}
+		if(null!=asjRyRelateVO.getZczjywsjzt07()){
+			zczjywsjzt07="07";
+		}
+		if(null!=asjRyRelateVO.getLaywsjzt01() && !"".equals(asjRyRelateVO.getLaywsjzt01())){
+			laywsjzt01="01";
+		}
+		if(null!=asjRyRelateVO.getLaywsjzt02() && !"".equals(asjRyRelateVO.getLaywsjzt02())){
+			laywsjzt02="02";
+		}
+		if(null!=asjRyRelateVO.getLaywsjzt05() && !"".equals(asjRyRelateVO.getLaywsjzt05())){
+			laywsjzt05="05";
+		}
+		if(null!=asjRyRelateVO.getLaywsjzt07() && !"".equals(asjRyRelateVO.getLaywsjzt07())){
+			laywsjzt07="07";
+		}
+		String ajzt01 = " ZCZJYWSJZT:("+ zczjywsjzt01 +" "+ zczjywsjzt02 +" "+ zczjywsjzt07 +" "+ ")";
+		String ajzt02 = "OR  LAYWSJZT:("+ laywsjzt01 +" "+ laywsjzt02 +" "+ laywsjzt05 +" "+ laywsjzt07 +" "+ ")";
+		String sjzt = ajzt01 + ajzt02;
+
+		//如果没选案件状态默认查询不包含撤销案件
+		if(null==asjRyRelateVO.getLaywsjzt01()&&null==asjRyRelateVO.getLaywsjzt02()&&null==asjRyRelateVO.getSfbhcxaj()
+				&&null==asjRyRelateVO.getLaywsjzt07()&&null==asjRyRelateVO.getZczjywsjzt00()&&null==asjRyRelateVO.getZczjywsjzt01()
+				&&null==asjRyRelateVO.getZczjywsjzt02()&&null==asjRyRelateVO.getZczjywsjzt07()){
+			asjQ += " AND -(LAYWSJZT:05)";
+		}else{
+			if(null!=asjRyRelateVO.getZczjywsjzt00() && !"".equals(asjRyRelateVO.getZczjywsjzt00())){
+				asjQ += " AND (((((-ZCZJYWSJZT:* AND *:*) OR ZCZJYWSJZT:(00)) AND LAYWSJZT:07) )"+sjzt+")";
+			}else{
+				asjQ += " AND ("+ sjzt+")";
+			}
+
 		}
 
 		if(null!=asjRyRelateVO.getLaywsjztmc() && !"".equals(asjRyRelateVO.getLaywsjztmc())){

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

@@ -145,6 +145,10 @@ public class SolrServiceImpl implements SolrService {
                     String date ="";
                     date = asjfssjAsjfskssj + larq + zczjsj;
                     mapResult.put("ajxgsj", date);
+                    mapResult.put("laywspsj", solrDocument.get("LAYWSPSJ"));
+                    mapResult.put("zczjspsj", solrDocument.get("ZCZJSPSJ"));
+                    mapResult.put("lacqsj", solrDocument.get("LACQSJ"));
+                    mapResult.put("zczjcqsj", solrDocument.get("ZCZJCQSJ"));
                     mapResult.put("jyaq", solrDocument.get("JYAQ"));
                     mapResult.put("ladw_gajgmc", solrDocument.get("LADW_GAJGMC"));
                     mapResult.put("slsj", solrDocument.get("SLSJ"));

src/main/webapp/macx.jsp

@@ -212,7 +212,7 @@
                                                             <input type="checkbox" showType="checkbox" name="laywsjzt07" id="laywsjzt07" value="07"><label for="laywsjzt07">立案已上报</label>
                                                         </td>
                                                         <td class="td_title" style="text-align: left">
-                                                            <input type="checkbox" showType="checkbox" name="Sfbhcxaj" id="sfbhcxaj" value="00"><label for="Sfbhcxaj">包含已撤销案件</label>
+                                                            <input type="checkbox" showType="checkbox" name="Sfbhcxaj" id="sfbhcxaj" value="00"><label for="Sfbhcxaj">已撤销案件</label>
                                                         </td>
 
                                                         <td class="td_title"></td>
@@ -2468,7 +2468,7 @@
         <h1>提示</h1>
         <div class="xtyhts_center">
             <p>1、命案筛查默认查询结果不包含已撤销的案件。</p>
-            <p>2、若查询已撤销案件，请勾选案件状态里的包含已撤销案件。</p>
+            <p>2、若查询已撤销案件，请勾选案件状态里的已撤销案件。</p>
         </div>
         <div class="btn_div"><a class="close_btn" onclick='hideTip();noShow()'>我 知 道 了</a><input type='checkbox' id='notip' style="margin: 0 2px 0 28px;"/><label for='notip'>不再提示</label></div>
     </div>