Merge remote-tracking branch 'origin/dev_neimeng' into dev_neimeng

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

@@ -41,7 +41,7 @@ public class RecordController {
             record.setXyr_record("案事件编号:asjbh,证件号码:cyzj_zjhm,姓名:xm,性别:xbdmmc,民族:mzmc,户籍地行政区划:hjdz_xzqhmc,现住地行政区划:xzz_xzqhmc,到案状态:zhfzxyr_fzxyrdaztmc");
             record.setRybh_record("案事件编号:asjbh,证件号码:cyzj_zjhm,姓名:xm,性别:xbdmmc,民族:mzmc,户籍地行政区划:hjdz_xzqhmc,人身侵犯结果:rsqfjgmc,人身伤害程度:rsshcdmc");
             record.setAjzlz_record("案事件编号:caseid,案件类别:casetypemc,发案区域:caseareamc,案件时间:casetimef,案件状态:casestatusmc,立案单位:registerunit_gajgmc,简要案情:brief");
-            record.setMisxyr_record("案事件编号:caseid,姓名:name,性别:sex,口音:accent,国籍:nation,民族:folk,身份证号:idcardnumb,指纹编号:fingerprintnumb");
+            record.setMisxyr_record("案事件编号:caseid,姓名:misxyr_name,性别:misxyr_sex,出生日期:misxyr_birthday,民族:misxyr_nation,身份证号:misxyr_idcardno,户籍地行政区划:misxyr_doormc,现住地行政区划:misxyr_addressmc");
             record.setMisshr_record("案事件编号:caseid,姓名:name,性别:sex,出生日期:birthday,单位:unit,住址详情:addrdetail,伤害程度:harmgread,户籍地址:hjdetail");
             record.setMisbar_record("案事件编号:caseid,姓名:name,性别:sex,出生日期:birthday,住址详情:addre,身份证号:idcardnumb,电话:phone,报案方式:reportmethod");
             record.setMissj_record("案事件编号:caseid,手机品牌:brand");

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

@@ -684,18 +684,18 @@ public class MisSolrServiceImpl implements IMisSolrService {
                 solrParams.add("q", q);
                 solrParams.add("start", begin + "");
                 solrParams.add("rows", end + "");
-                if (StringUtils.isNotBlank(sort) && sort.equals("SERIAL")) {
+                if (StringUtils.isNotBlank(sort) && sort.equals("MISXYR_PERSONID")) {
                     solrParams.add("sort", sort.toUpperCase() + " " + order);
                 } else {
                     if (StringUtils.isNotBlank(order)) {
-                        if (sort.equals("accent")) {
-                            solrParams.add("sort", "ACCENT" + " " + order);
+                        if (sort.equals("misxyr_idcardno")) {
+                            solrParams.add("sort", "MISXYR_IDCARDNO" + " " + order);
                         } else {
                             solrParams.add("sort", sort.toUpperCase() + " " + order);
                         }
 
                     } else {
-                        solrParams.add("sort", "SERIAL DESC");
+                        solrParams.add("sort", "MISXYR_PERSONID DESC");
                     }
                 }
                 String flag = "";
@@ -730,18 +730,17 @@ public class MisSolrServiceImpl implements IMisSolrService {
                 Map<String, Map<String, List<String>>> highlighting = queryResponse.getHighlighting();
                 for (SolrDocument solrDocument : results) {
                     Map<String, Object> mapResult = new HashMap<String, Object>();
-                    mapResult.put("caseid", solrDocument.get("CASEID"));
-                    mapResult.put("name", solrDocument.get("NAME"));
-                    mapResult.put("sex", solrDocument.get("SEX"));
-                    mapResult.put("accent", solrDocument.get("ACCENT"));
-                    mapResult.put("nation", solrDocument.get("NATION"));
-                    mapResult.put("folk", solrDocument.get("FOLK"));
-                    mapResult.put("idcardnumb", solrDocument.get("IDCARDNUMB"));
-                    mapResult.put("fingerprintnumb", solrDocument.get("FINGERPRINTNUMB"));
-
+                    //mapResult.put("caseid", solrDocument.get("CASEID"));
+                    mapResult.put("misxyr_name", solrDocument.get("MISXYR_NAME"));
+                    mapResult.put("misxyr_sex", solrDocument.get("MISXYR_SEX"));
+                    mapResult.put("misxyr_nation", solrDocument.get("MISXYR_NATION"));
+                    mapResult.put("misxyr_birthday", solrDocument.get("MISXYR_BIRTHDAY"));
+                    mapResult.put("misxyr_idcardno", solrDocument.get("MISXYR_IDCARDNO"));
+                    mapResult.put("misxyr_doormc", solrDocument.get("MISXYR_DOORMC"));
+                    mapResult.put("misxyr_addressmc", solrDocument.get("MISXYR_ADDRESSMC"));
                     // 输出高亮
-                    Map<String, List<String>> map = highlighting.get(solrDocument.get("CASEID"));
-                    List<String> list = map.get("keywords");
+                    Map<String, List<String>> map = highlighting.get(solrDocument.get("MISXYR_PERSONID"));
+                    //List<String> list = map.get("keywords");
                     asjxxList.add(mapResult);
                 }
                 //根据查询条件分页查询案件信息 end
@@ -750,7 +749,7 @@ public class MisSolrServiceImpl implements IMisSolrService {
                     String[] arr = groupids.split(",");
                     for (int i = 0; i < arr.length; i++) {
                         String groupid = "";
-                        groupid = "CASE_S_XYR";
+                        groupid = "CASE_PNS_CRIMINAL";
                         Map<String, Object> total = new HashedMap();
                         ModifiableSolrParams groupSolrParams = new ModifiableSolrParams();
                         SolrQuery groupFilterQuery = new SolrQuery();

src/main/webapp/static/rasc/js/navCategory_zj.js

@@ -222,7 +222,7 @@ var navCategory = {
         else if(searchType=='misxyr'){
             presentType = $('input[type=radio][name="misxyrPresentType"]:checked ').val();
             url = "listMisXyr";
-            sorlInstance = "CASE_S_XYR";
+            sorlInstance = "CASE_PNS_CRIMINAL";
         }
         else if(searchType=='misbhr'){
             presentType = $('input[type=radio][name="misxyrPresentType"]:checked ').val();