Skip to content

X
xzxt-solr
Commit 23b067e0 by wangxing
Options

命案查询添加案件状态：同归撤销审批

parent 4708d2ab
Showing with 39 additions and 14 deletions
src/main/java/com/cc/controller/SolrController.java
......@@ -1414,17 +1414,18 @@ 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;
//增减zczjywsjzt为null和00的判断 此状态为等待侦查终结采集
if((null!=asjRyRelateVO.getLaywsjzt01()||null!=asjRyRelateVO.getLaywsjzt02()||null!=asjRyRelateVO.getLaywsjzt07()) &&(null!=asjRyRelateVO.getZczjywsjzt00()||null!=asjRyRelateVO.getZczjywsjzt01()||null!=asjRyRelateVO.getZczjywsjzt02()||null!=asjRyRelateVO.getZczjywsjzt07())){
if((null!=asjRyRelateVO.getLaywsjzt01()||null!=asjRyRelateVO.getLaywsjzt02()||null!=asjRyRelateVO.getLaywsjzt05()||null!=asjRyRelateVO.getLaywsjzt07()) &&(null!=asjRyRelateVO.getZczjywsjzt00()||null!=asjRyRelateVO.getZczjywsjzt01()||null!=asjRyRelateVO.getZczjywsjzt02()||null!=asjRyRelateVO.getZczjywsjzt07())){
if(null!=asjRyRelateVO.getZczjywsjzt00() && !"".equals(asjRyRelateVO.getZczjywsjzt00())){
zczjywsjzt="((-ZCZJYWSJZT:* AND *:*) OR ZCZJYWSJZT:(00 ";
asjQ += " AND(LAYWSJZT:("+asjRyRelateVO.getLaywsjzt01()+" "+asjRyRelateVO.getLaywsjzt02()+" "+asjRyRelateVO.getLaywsjzt07()+")OR ZCZJYWSJZT:"+zczjywsjzt+asjRyRelateVO.getZczjywsjzt01()+" "+asjRyRelateVO.getZczjywsjzt02()+" "+asjRyRelateVO.getZczjywsjzt07()+")))";
asjQ += " AND(LAYWSJZT:("+asjRyRelateVO.getLaywsjzt01()+" "+asjRyRelateVO.getLaywsjzt02()+" "+asjRyRelateVO.getLaywsjzt05()+" "+asjRyRelateVO.getLaywsjzt07()+")OR ZCZJYWSJZT:"+zczjywsjzt+asjRyRelateVO.getZczjywsjzt01()+" "+asjRyRelateVO.getZczjywsjzt02()+" "+asjRyRelateVO.getZczjywsjzt07()+")))";
}else{
asjQ += " AND(LAYWSJZT:("+asjRyRelateVO.getLaywsjzt01()+" "+asjRyRelateVO.getLaywsjzt02()+" "+asjRyRelateVO.getLaywsjzt07()+")OR ZCZJYWSJZT:("+zczjywsjzt+" "+asjRyRelateVO.getZczjywsjzt01()+" "+asjRyRelateVO.getZczjywsjzt02()+" "+asjRyRelateVO.getZczjywsjzt07()+"))";
asjQ += " AND(LAYWSJZT:("+asjRyRelateVO.getLaywsjzt01()+" "+asjRyRelateVO.getLaywsjzt02()+" "+asjRyRelateVO.getLaywsjzt05()+" "+asjRyRelateVO.getLaywsjzt07()+")OR ZCZJYWSJZT:("+zczjywsjzt+" "+asjRyRelateVO.getZczjywsjzt01()+" "+asjRyRelateVO.getZczjywsjzt02()+" "+asjRyRelateVO.getZczjywsjzt07()+"))";
}
}
else{
......@@ -1434,11 +1435,14 @@ public class SolrController {
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";
}
if(null!=asjRyRelateVO.getLaywsjzt01()||null!=asjRyRelateVO.getLaywsjzt02()||null!=asjRyRelateVO.getLaywsjzt07()){
asjQ += " AND LAYWSJZT:("+laywsjzt01+" "+laywsjzt02+" "+laywsjzt07+")";
if(null!=asjRyRelateVO.getLaywsjzt01()||null!=asjRyRelateVO.getLaywsjzt02()||null!=asjRyRelateVO.getLaywsjzt05()||null!=asjRyRelateVO.getLaywsjzt07()){
asjQ += " AND LAYWSJZT:("+laywsjzt01+" "+laywsjzt02+" "+laywsjzt05+" "+laywsjzt07+")";
}
if(((null!=asjRyRelateVO.getZczjywsjzt00() && !"".equals(asjRyRelateVO.getZczjywsjzt00()))&&(null!=asjRyRelateVO.getZczjywsjzt01() && !"".equals(asjRyRelateVO.getZczjywsjzt01())))
......
src/main/java/com/cc/model/AsjRyRelateVO.java
......@@ -323,6 +323,7 @@ public class AsjRyRelateVO {
//处理状态多选问题 因为插件问题目前必须这么处理
private String laywsjzt01;
private String laywsjzt02;
private String laywsjzt05;
private String laywsjzt07;
private String zczjywsjzt;
private String zczjywsjzt00;
......@@ -5126,4 +5127,12 @@ public class AsjRyRelateVO {
public void setZbgc(String zbgc) {
this.zbgc = zbgc;
}
public String getLaywsjzt05() {
return laywsjzt05;
}
public void setLaywsjzt05(String laywsjzt05) {
this.laywsjzt05 = laywsjzt05;
}
}
src/main/java/com/cc/service/impl/SolrServiceImpl.java
......@@ -1096,8 +1096,10 @@ public class SolrServiceImpl implements SolrService {
mapResult.put("asjswry_rs", solrDocument.get("ASJSWRY_RS"));
mapResult.put("laywsjztmc", solrDocument.get("LAYWSJZTMC"));
String lazt=String.valueOf(solrDocument.get("LAYWSJZTMC"));
String a=lazt.replaceAll("</br>","").replaceAll("null","");
String zczjzt=String.valueOf(solrDocument.get("ZCZJYWSJZTMC"));
String sjzt=lazt+ "</br>"+zczjzt;
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"));
......
src/main/webapp/macx.jsp
......@@ -184,28 +184,38 @@
</td>
</tr>
<tr>
<td class="td_title">案件状态：</td>
<!--侦查终结业务数据状态,00呈请,01待审批,02审批通过,03审批未通过,04待撤销,05已撤销,06撤销未通过,07已上报,08上报失败-->
<td class="td_title" style="text-align: center">
<td class="td_title" style="text-align: left">
<input type="checkbox" showType="checkbox" name="laywsjzt01" id="laywsjzt01" value="01"><label for="laywsjzt01">等待立案审批</label>
</td>
<td class="td_title" style="text-align: center">
<td class="td_title" style="text-align: left">
<input type="checkbox" showType="checkbox" name="laywsjzt02" id="laywsjzt02" value="02"><label for="laywsjzt02">通过立案审批</label>
</td>
<td class="td_title" style="text-align: center">
<td class="td_title" style="text-align: left">
<input type="checkbox" showType="checkbox" name="laywsjzt07" id="laywsjzt07" value="07"><label for="laywsjzt07">立案已上报</label>
</td>
<td class="td_title" style="text-align: center">
<input type="checkbox" showType="checkbox" name="zczjywsjzt00" id="zczjywsjzt00" value="00"><label for="zczjywsjzt00">等待侦查终结采集</label>
<td class="td_title" style="text-align: left">
<input type="checkbox" showType="checkbox" name="laywsjzt05" id="laywsjzt05" value="05"><label for="laywsjzt05">通过撤销审批</label>
</td>
<td class="td_title" style="text-align: center">
<td class="td_title"></td>
</tr>
<tr>
<td class="td_title"></td>
<td class="td_title" style="text-align: left">
<input type="checkbox" showType="checkbox" name="zczjywsjzt01" id="zczjywsjzt01" value="01"><label for="zczjywsjzt01">等待侦查终结审批</label>
</td>
<td class="td_title" style="text-align: center">
<td class="td_title" style="text-align: left">
<input type="checkbox" showType="checkbox" name="zczjywsjzt02" id="zczjywsjzt02" value="02"><label for="zczjywsjzt02">通过侦查终结审批</label>
</td>
<td class="td_title" style="text-align: center">
<td class="td_title" style="text-align: left">
<input type="checkbox" showType="checkbox" name="zczjywsjzt07" id="zczjywsjzt07" value="07"><label for="zczjywsjzt07">侦查终结已上报</label>
</td>
<td class="td_title" style="text-align: left">
<input type="checkbox" showType="checkbox" name="zczjywsjzt00" id="zczjywsjzt00" value="00"><label for="zczjywsjzt00">等待侦查终结采集</label>
</td>
<td class="td_title"></td>
</tr>
<%-- <tr>
......
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