Skip to content

X
xzxt-solr
Commit 7acfd927 by YANGYANG
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/webapp/macx.jsp
parents a59558bf 3ee8098e
Showing with 99 additions and 67 deletions
src/main/java/com/cc/controller/SolrController.java
......@@ -2749,7 +2749,7 @@ public class SolrController {
*/
@RequestMapping("/listTbStXyr")
@ResponseBody
public EasyUIPage listTbStXyr(HttpServletRequest request, AsjRyRelateVO asjRyRelateVO, String unitcode, String groupids,String sort,String order,String sorlInstance,String daohan,String groupidvalue){
public EasyUIPage listTbStXyr(HttpServletRequest request, AsjRyRelateVO asjRyRelateVO, String unitcode, String groupids,String sort,String order,String sorlInstance,String daohan,String groupidvalue,String selectedCols){
Properties properties=propertiesUtil("solr.properties");
String sorlAddress =properties.getProperty("sorlAddress");
Properties configProperties=propertiesUtil("config.properties");
......@@ -2760,6 +2760,18 @@ public class SolrController {
Map<String,Object> map = getXyrFqList(asjRyRelateVO);
List<String> fqList = (List<String>)map.get("fqList");
//Sorl查询
Record record = new Record();
record.setXyr_record(selectedCols);
String [] cols = selectedCols.split(",");
Object [] head = new String[cols.length];
String [] names = new String[cols.length];
for(int i=0;i<cols.length;i++){
String col = cols[i];
String [] arr = col.split(":");
head[i] = arr[0];
names[i] = arr[1];
}
recordService.updateRecord(record);
String page = request.getParameter("page");
String rows = request.getParameter("rows");
System.out.println(page+"----------"+rows);
......
src/main/webapp/macx.jsp
......@@ -1689,7 +1689,14 @@
var ajcheckConfig = { //案件暂定已选数据
checkList: [
{
'1':['id','案事件编号'],
'2':['ajmc','案件名称'],
'3':['zcjdmc','侦查阶段'],
'4':['sjzt','业务状态'],
'5':['ajlbdmmc','案件类别'],
'6':['ajxgsj','案件时间'],
'7':['ladw_gajgmc','立案单位'],
'8':['jyaq','简要案情']
}
]
};
......@@ -1711,15 +1718,7 @@
'13':['asjfsdd_xzqhmc','案发地点区划'],
'14':['zuzdw_zbr_xm','主办人'],
'15':['zuzdw_xbr_xm1','协办人'],
'16':['zuzdw_gajgmc','主侦单位'],
'17':['id','案事件编号'],
'18':['ajmc','案件名称'],
'19':['zcjdmc','侦查阶段'],
'20':['sjzt','业务状态'],
'21':['ajlbdmmc','案件类别'],
'22':['ajxgsj','案件时间'],
'23':['ladw_gajgmc','立案单位'],
'24':['jyaq','简要案情']
'16':['zuzdw_gajgmc','主侦单位']
}
]
};
......@@ -1881,7 +1880,7 @@
}else if(searchType=="rybh"){
table_header_info=rybhcheckConfig['checkList'][0];
list_config=rybhwaitingConfig['checkList'][0];
}else {
}else{
table_header_info=ajcheckConfig['checkList'][0];
list_config=ajwaitingConfig['checkList'][0];
}
......@@ -1910,23 +1909,11 @@
$('#selected_ul').append(html_li);
}
}
if(searchType=="aj"){
cols = data.aj_record.split(",");
console.log(cols);
for (var i = 0; i < cols.length; i++) {
var col = cols[i];
var arr = [];
arr = col.split(":");
var head = [];
var names = [];
head[i] = arr[0];
names[i] = arr[1];
console.log(head[i])
console.log(names[i])
var html_li = '<li><div rel="' + names[i] + '" name="' + head[i] + '">' + head[i] + '</div></li>';
$('#selected_ul').append(html_li);
}
for(var i in table_header_info){
var rel_val = table_header_info[i];
console.log(rel_val)
var html_li = '<li><div rel="'+rel_val[0]+'" name="'+rel_val[1]+'">'+rel_val[1]+'</div></li>';
$('#selected_ul').append(html_li);
}
}
});
......
src/main/webapp/rasc.jsp
......@@ -1888,63 +1888,59 @@
var xyrcheckConfig = { //嫌疑人暂定已选数据
checkList: [
{
'1':['asjbh','案事件编号'],
'2':['cyzj_zjhm','证件号码'],
'3':['xm','姓名'],
'4':['xbdmmc','性别'],
'5':['mzmc','民族'],
'6':['jgmc','籍贯'],
'7':['zhfzxyr_fzxyrdaztmc','到案状态']
}
]
};
var xyrwaitingConfig = { //嫌疑人暂定待选数据
checkList: [
{
'1':['csrq_rqgzxx','出生日期'],
'2':['gjmc','国籍'],
'3':['hjdz_xzqhmc','户籍地行政区划'],
'4':['xzz_xzqhmc','现住地行政区划'],
'5':['hjdz_dzmc','户籍地址名称'],
'6':['xzz_dzmc','现住地址名称'],
'7':['zhfs_zhfsmc','抓获方式'],
'8':['zhdd_xzqhmc','抓获地行政区划'],
'9':['zhdd_dzmc','抓获地址名称'],
'10':['djsj','登记时间'],
'11':['rydnabh','人员DNA编号'],
'12':['szzwbh','食指指纹编号'],
'13':['zuzdw_zbr_xm','主办人'],
'14':['zuzdw_gajgmc','主侦单位']
'1':['asjbh','案事件编号'],
'2':['cyzj_zjhm','证件号码'],
'3':['xm','姓名'],
'4':['xbdmmc','性别'],
'5':['mzmc','民族'],
'6':['hjdz_xzqhmc','户籍地行政区划'],
'7':['xzz_xzqhmc','现住地行政区划'],
'8':['zhfzxyr_fzxyrdaztmc','到案状态'],
'9':['csrq_rqgzxx','出生日期'],
'10':['gjmc','国籍'],
'11':['jgmc','籍贯'],
'12':['hjdz_dzmc','户籍地址名称'],
'13':['xzz_dzmc','现住地址名称'],
'14':['zhfs_zhfsmc','抓获方式'],
'15':['zhdd_xzqhmc','抓获地行政区划'],
'16':['zhdd_dzmc','抓获地址名称'],
'17':['djsj','登记时间'],
'18':['rydnabh','人员DNA编号'],
'19':['szzwbh','食指指纹编号']
}
]
};
var rybhcheckConfig = { //被害人暂定已选数据
checkList: [
{
'1':['asjbh','案事件编号'],
'2':['cyzj_zjhm','证件号码'],
'3':['xm','姓名'],
'4':['xbdmmc','性别'],
'5':['jgmc','籍贯'],
'6':['mzmc','民族']
}
]
};
var rybhwaitingConfig = { //被害人暂定待选数据
checkList: [
{
'1':['csrq_rqgzxx','出生日期'],
'2':['gjmc','国籍'],
'3':['hjdz_xzqhmc','户籍地行政区划'],
'4':['xzz_xzqhmc','现住地行政区划'],
'5':['hjdz_dzmc','户籍地址名称'],
'6':['xzz_dzmc','现住地址名称'],
{ '1':['asjbh','案事件编号'],
'2':['cyzj_zjhm','证件号码'],
'3':['xm','姓名'],
'4':['xbdmmc','性别'],
'5':['mzmc','民族'],
'6':['hjdz_xzqhmc','户籍地行政区划'],
'7':['rsqfjgmc','人身侵犯结果'],
'8':['rsshcdmc','人身伤害程度'],
'9':['djsj','登记时间'],
'10':['rydnabh','人员DNA编号'],
'11':['szzwbh','食指指纹编号']
'9':['szzwbh','食指指纹编号'],
'10':['csrq_rqgzxx','出生日期'],
'11':['rydnabh','人员DNA编号'],
'12':['gjmc','国籍'],
'13':['jgmc','籍贯'],
'14':['xzz_xzqhmc','现住地行政区划'],
'15':['hjdz_dzmc','户籍地址名称'],
'16':['xzz_dzmc','现住地址名称'],
'17':['djsj','登记时间']
}
]
};
......@@ -2055,12 +2051,49 @@
list_config=ajwaitingConfig['checkList'][0];
}
$('#selected_ul,#waiting_ul').empty();
$.ajax({
url: 'queryRybhRecord',
async:false,
type: 'post',
dataType: 'json',
success: function (data) {
var cols = [];
if(searchType=="rybh") {
cols = data.rybh_record.split(",");
for (var i = 0; i < cols.length; i++) {
var col = cols[i];
var arr = [];
arr = col.split(":");
var head = [];
var names = [];
head[i] = arr[0];
names[i] = arr[1];
var html_li = '<li><div rel="' + names[i] + '" name="' + head[i] + '">' + head[i] + '</div></li>';
$('#selected_ul').append(html_li);
}
}
if(searchType=="xyr") {
cols = data.xyr_record.split(",");
for (var i = 0; i < cols.length; i++) {
var col = cols[i];
var arr = [];
arr = col.split(":");
var head = [];
var names = [];
head[i] = arr[0];
names[i] = arr[1];
var html_li = '<li><div rel="' + names[i] + '" name="' + head[i] + '">' + head[i] + '</div></li>';
$('#selected_ul').append(html_li);
}
}
//加载显示的表头数据
for(var i in table_header_info){
var rel_val = table_header_info[i];
var html_li = '<li><div rel="'+rel_val[0]+'" name="'+rel_val[1]+'">'+rel_val[1]+'</div></li>';
$('#selected_ul').append(html_li);
}
}
});
//加载未显示的表格数据
for(var k in list_config){
var is_exist = $.inArray(k, table_header_info);
......
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