Skip to content

X
xzxt-solr
Commit f37acccd by wangxing
Options

命案查询，被害人查询条件添加人员DNA编号，食指指纹编号采集分类 

人案筛查页面，嫌疑人、被害人查询条件添加人员DNA编号，食指指纹编号采集分类
parent 8003b210
Showing with 120 additions and 6 deletions
src/main/java/com/cc/controller/SolrController.java
......@@ -5001,6 +5001,24 @@ public class SolrController {
Map<String, Object> map = new HashedMap();
List<String> fqList = new ArrayList<>();
String ryQ = "XXSC_PDBZ:0";
if(null!=asjRyRelateVO.getSzzwbh() && !"".equals(asjRyRelateVO.getSzzwbh())){
if("null".equals(asjRyRelateVO.getSzzwbh())){
ryQ += " AND -SZZWBH:*";
}else{
ryQ += " AND SZZWBH:['' TO *]";
//ryQ += " AND SZZWBH:"+asjRyRelateVO.getSzzwbh();
}
}
if(null!=asjRyRelateVO.getRydnabh() && !"".equals(asjRyRelateVO.getRydnabh())){
if("null".equals(asjRyRelateVO.getRydnabh())){
ryQ += " AND -RYDNABH:*";
}else{
ryQ += " AND RYDNABH:['' TO *]";
//ryQ += " AND RYDNABH:"+asjRyRelateVO.getRydnabh();
}
}
if(null!=asjRyRelateVO.getAsjxgrybh() && !"".equals(asjRyRelateVO.getAsjxgrybh())){
ryQ += " AND ID:*"+asjRyRelateVO.getAsjxgrybh()+"*";
}
......
src/main/java/com/cc/service/impl/SolrServiceImpl.java
......@@ -2539,6 +2539,8 @@ public class SolrServiceImpl implements SolrService {
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"));
ryxxList.add(mapResult);
}
if(null!=groupids && !"".equals(groupids)){
......@@ -2548,6 +2550,15 @@ public class SolrServiceImpl implements SolrService {
continue;
}
String groupid = arr[i].replaceFirst("RYBH_", "");
if(groupid.indexOf("RYBH")!=0){
groupid = arr[i].replaceFirst("RYBH_", "");
if("RYBH_RYDNABH".equals(arr[i])){
groupid = "RYDNABH";
}
if("RYBH_SZZWBH".equals(arr[i])){
groupid = "SZZWBH";
}
}
Map<String,Object> total = new HashedMap();
if(groupid.indexOf("GAJGJGDM_SECOND")!=-1) {
String xxdjdw_gajgjgdm = asjRyRelateVO.getXxdjdw_gajgjgdm_second();
......@@ -3113,6 +3124,8 @@ public class SolrServiceImpl implements SolrService {
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"));
bhrxxList.add(mapResult);
}
}
......
src/main/webapp/macx.jsp
......@@ -1418,6 +1418,22 @@
value="RYBH_RSQFJGMC"
id="RYBH_RSQFJGMC"><label
for="RYBH_RSQFJGMC">人身侵犯结果分类</label></li>
<li class="searchConfigCheck pull-left"><input type="checkbox"
showtype="minCheck"
onclick="navCategory.resultNavCheckBoxClick(this)"
name="navOption"
value="RYBH_SZZWBH"
id="RYBH_SZZWBH"><label
for="XYR_SZZWBH">指纹采集分类</label>
</li>
<li class="searchConfigCheck pull-left"><input type="checkbox"
showtype="minCheck"
onclick="navCategory.resultNavCheckBoxClick(this)"
name="navOption"
value="RYBH_RYDNABH"
id="RYBH_RYDNABH"><label
for="XYR_RYDNABH">DNA采集分类</label>
</li>
</ul>
<div class="searchConfigBts"><a href="javascript: void(0);" class="btn"
title="清空查询条件"
......@@ -1744,7 +1760,9 @@
'4':['xzz_xzqhmc','现住地行政区划'],
'5':['hjdz_dzmc','户籍地址名称'],
'6':['xzz_dzmc','现住地址名称'],
'7':['djsj','登记时间']
'7':['djsj','登记时间'],
'8':['rydnabh','人员DNA编号'],
'9':['szzwbh','食指指纹编号']
}
]
};
......
src/main/webapp/rasc.jsp
......@@ -101,8 +101,8 @@
onclick="navCategoryFormUtils.subFormCheck(this);"
target="ajxx-sswp">
损失物品<span></span>
</li>
<li class="small-title pull-left"
</li>--%>
<%-- <li class="small-title pull-left"
onclick="navCategoryFormUtils.subFormCheck(this);"
target="ajxx-zasygj">
作案使用工具<span></span>
......@@ -1394,6 +1394,22 @@
id="XYR_SRZACSCOUNT"><label
for="XYR_SRZACSCOUNT">3人以上作案分类</label>
</li>
<li class="searchConfigCheck pull-left"><input type="checkbox"
showtype="minCheck"
onclick="navCategory.resultNavCheckBoxClick(this)"
name="navOption"
value="XYR_SZZWBH"
id="XYR_SZZWBH"><label
for="XYR_SZZWBH">指纹采集分类</label>
</li>
<li class="searchConfigCheck pull-left"><input type="checkbox"
showtype="minCheck"
onclick="navCategory.resultNavCheckBoxClick(this)"
name="navOption"
value="XYR_RYDNABH"
id="XYR_RYDNABH"><label
for="XYR_RYDNABH">DNA采集分类</label>
</li>
</ul>
<div class="searchConfigBts"><a href="javascript: void(0);" class="btn"
title="清空查询条件"
......@@ -1500,6 +1516,22 @@
value="RYBH_RSSHCDMC"
id="RYBH_RSSHCDMC"><label
for="RYBH_RSSHCDMC">人身侵犯结果分类</label></li>
<li class="searchConfigCheck pull-left"><input type="checkbox"
showtype="minCheck"
onclick="navCategory.resultNavCheckBoxClick(this)"
name="navOption"
value="RYBH_SZZWBH"
id="RYBH_SZZWBH"><label
for="RYBH_SZZWBH">指纹采集分类</label>
</li>
<li class="searchConfigCheck pull-left"><input type="checkbox"
showtype="minCheck"
onclick="navCategory.resultNavCheckBoxClick(this)"
name="navOption"
value="RYBH_RYDNABH"
id="RYBH_RYDNABH"><label
for="RYBH_RYDNABH">DNA采集分类</label>
</li>
</ul>
<div class="searchConfigBts"><a href="javascript: void(0);" class="btn"
title="清空查询条件"
......@@ -1845,6 +1877,7 @@
'4':['xbdmmc','性别'],
'5':['mzmc','民族'],
'6':['jgmc','籍贯']
}
]
};
......@@ -1860,7 +1893,9 @@
'7':['zhfs_zhfsmc','抓获方式'],
'8':['zhdd_xzqhmc','抓获地行政区划'],
'9':['zhdd_dzmc','抓获地址名称'],
'10':['djsj','登记时间']
'10':['djsj','登记时间'],
'11':['rydnabh','人员DNA编号'],
'12':['szzwbh','食指指纹编号']
}
]
};
......@@ -1887,7 +1922,9 @@
'6':['xzz_dzmc','现住地址名称'],
'7':['rsqfjgmc','人身侵犯结果'],
'8':['rsshcdmc','人身伤害程度'],
'9':['djsj','登记时间']
'9':['djsj','登记时间'],
'10':['rydnabh','人员DNA编号'],
'11':['szzwbh','食指指纹编号']
}
]
};
......@@ -2081,6 +2118,14 @@
text = "作案人数";
groupid = "ZARFX_RS";
id="ZARFX_RS";
}else if(groupid=="RYDNABH"){
text = "人员DNA编号";
groupid = "RYDNABH";
id="RYDNABH";
}else if(groupid=="SZZWBH"){
text = "人员指纹编号";
groupid = "SZZWBH";
id="SZZWBH";
}else{
text =$("[type='checkbox'][id='"+searchType.toUpperCase()+"_"+groupid+"']").parent().find("label").text();
text=text.substring(0,text.length-2);
......@@ -2101,8 +2146,28 @@
}
str+="<div class=\"newNavInfo\" isshowed=\"false\"><div class=\"newClear\"></div>";
if (item.groupList && item.groupList.length>0) {
var num=item.groupList.length-1;
console.log(num);
$.each(item.groupList, function (i, item) {
var groupvalue = item.groupValue;
if (groupid == "SZZWBH" || groupid == 'RYDNABH') {
if (groupvalue == null || groupvalue == 'null') {
groupvalue = "未采集";
str += "<a class=\"newNavA\" style=\"text-decoration:none;\" onclick=\"navCategory.getSingleCodeLevel('" + searchType + "','"+groupid+"','" + item.groupValue + "','" +groupvalue+ "','" + id + "')\">" + groupvalue + "(" + item.groupNum + ")</a>";
}else{
groupvalue = "已采集";
if(i==num){
str += "<a class=\"newNavA\" style=\"text-decoration:none;\" onclick=\"navCategory.getSingleCodeLevel('" + searchType + "','"+groupid+"','" + item.groupValue + "','" +groupvalue+ "','" + id + "')\">" + groupvalue + "(" + num + ")</a>";
}
}
}else{
if (groupvalue == null || groupvalue == 'null') {
groupvalue = "未知";
}
if (groupvalue == null || groupvalue == 'null') {
if(groupid!="DDZACSCOUNT" && groupid!="ERZACSCOUNT" && groupid!="SRZACSCOUNT"){
groupvalue = "未知";
......@@ -2228,7 +2293,7 @@
str += "<a class=\"newNavA\" style=\"text-decoration:none;\" onclick=\"navCategory.searchFormByDate('" + searchType + "','"+groupid+"','" + item.groupValue + "','" + id + "')\">" + groupvalue + "(" + item.groupNum + ")</a>";
}else{
str += "<a class=\"newNavA\" style=\"text-decoration:none;\" onclick=\"navCategory.getSingleCodeLevel('" + searchType + "','"+groupid+"','" + item.groupValue + "','" +groupvalue+ "','" + id + "')\">" + groupvalue + "(" + item.groupNum + ")</a>";
}
}}
}
});
}
......
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