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

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

@@ -4711,6 +4711,9 @@ public class SolrServiceImpl implements SolrService {
                     mapResult.put("spsj", solrDocument.get("SPSJ"));
                     mapResult.put("spyj", solrDocument.get("SPYJ"));
                     mapResult.put("spr_xm", solrDocument.get("SPR_XM"));
+
+                    mapResult.put("xckybh", solrDocument.get("XCKYBH"));
+                    mapResult.put("stjy_rydnabh", solrDocument.get("STJY_RYDNABH"));
                     xyrxxList.add(mapResult);
                 }
             }
@@ -4801,6 +4804,9 @@ public class SolrServiceImpl implements SolrService {
                     mapResult.put("spsj", solrDocument.get("SPSJ"));
                     mapResult.put("spyj", solrDocument.get("SPYJ"));
                     mapResult.put("spr_xm", solrDocument.get("SPR_XM"));
+
+                    mapResult.put("xckybh", solrDocument.get("XCKYBH"));
+                    mapResult.put("stjy_rydnabh", solrDocument.get("STJY_RYDNABH"));
                     ryxxList.add(mapResult);
                 }
                 if(null!=groupids && !"".equals(groupids)){

src/main/resources/jdbcconfig.properties

 
 #\u5185\u8499
 jdbc.driverClass=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.1.102:1521:XZXT
+jdbc.url=jdbc:oracle:thin:@47.92.129.99:1600:orcl
 jdbc.user=XZXT
 jdbc.password=XZXT
 
 
 #mis
 jdbc.mis.driverClass=oracle.jdbc.driver.OracleDriver
-jdbc.mis.url=jdbc:oracle:thin:@192.168.1.102:1521:XZXT
+jdbc.mis.url=jdbc:oracle:thin:@47.92.129.99:orcl
 jdbc.mis.user=DBAUSERGAXZ
 jdbc.mis.password=DBAUSERGAXZ
\ No newline at end of file

src/main/webapp/wzmstcx.jsp

@@ -863,6 +863,8 @@
                 '3':['xxdjdw_gajgmc','登记单位'],
                 '4':['wzmst_djsj_desc','登记时间'],
                 '5':['xxdjry_xm','登记人姓名'],
+                '6':['xckybh','现场勘验编号'],
+                '7':['stjy_rydnabh','人员DNA'],
 
 
             }