Merge remote-tracking branch 'remotes/master/zhuly_bate' into caopeng_bate1

META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Main-Class: sun.rmi.server.Activation
+

src/main/java/com/founder/interservice/model/AutoTbStRy.java

@@ -49,4 +49,7 @@ public class AutoTbStRy {
     private String zjxydm;//宗教信仰代码
 
     private String zzmmdm;// 政治面貌代码
+
+    private String mzdmmc;//民族名称
+    private String hjmc;
 }
\ No newline at end of file

src/main/java/com/founder/interservice/ryhx/controller/RyhxController.java

@@ -26,23 +26,29 @@ public class RyhxController {
     List<Relation> relationInList = new ArrayList<Relation>();
     List<Relation> relationLaList = new ArrayList<Relation>();
     Relation relation = new Relation();
+    private AutoTbStRy ryxx;
     int z = 0;
 
     @RequestMapping(value = "/toRyhxJsp",method = {RequestMethod.GET,RequestMethod.POST})
     public ModelAndView toRyhxJsp(String zjhm){
         String code = "";
-        AutoTbStRy ryxx = new AutoTbStRy();
         SysDictitem sysDictitem = new SysDictitem();
         try{
         Qgckzp getryxx = new Qgckzp();
         ryxx = getryxx.getQgckAllxxXml(zjhm);
-        System.out.print("ryxx========人员常口"+ryxx);
-            /*ryxx.setXbdm("0");
-            ryxx.setZylbdm("834");
-            ryxx.setJgdm("150627730000");
-            ryxx.setJyzkdm("10");
-            ryxx.setXldm("11");*/
         if(ryxx != null){
+       /* //姓名
+        String xm = ryxx.getXm();
+            ryxx.setXm(xm);
+        //电话
+        String lxdh = ryxx.getLxdh();
+            ryxx.setLxdh(lxdh);
+        //出生地
+        String csdDzmc = ryxx.getCsdDzmc();
+            ryxx.setCsdDzmc(csdDzmc);
+        //常用证件号码
+        String cyzjZjhm = ryxx.getCyzjZjhm();
+            ryxx.setCyzjZjhm(cyzjZjhm);*/
         //性别
         String xbdm = ryxx.getXbdm();
         if (xbdm != null && !"".equals(xbdm)){
@@ -56,31 +62,23 @@ public class RyhxController {
                 ryxx.setXbdm("未说明的性别");
             }
         }
-        //职业
-        code = ryxx.getZylbdm();
-        sysDictitem.setCode(code);
-        sysDictitem.setGroupid("CODE_ZY");
-        if(code != null && !"".equals(code)){
-            String name = sysDictService.getCodeName(sysDictitem);
-            ryxx.setZylbdm(name);
-        }
-        //籍贯
-        code = ryxx.getJgdm();
+        //户籍地
+        code = ryxx.getHjdzXzqhdm();
         sysDictitem.setCode(code);
         sysDictitem.setGroupid("CODE_UNIT");
         if(code != null && !"".equals(code)){
-            String jgmc = sysDictService.getCodeName(sysDictitem);
-            ryxx.setJgdm(jgmc);
+             String hjdzDzmc = sysDictService.getCodeName(sysDictitem);
+             ryxx.setHjmc(hjdzDzmc);
         }
-        //婚姻状况
-        code = ryxx.getJyzkdm();
+        //民族
+        code = ryxx.getMzdm();
         sysDictitem.setCode(code);
-        sysDictitem.setGroupid("CODE_HYZK");
+        sysDictitem.setGroupid("CODE_MZ");
         if(code != null && !"".equals(code)){
-            String jyzkmc = sysDictService.getCodeName(sysDictitem);
-            ryxx.setJyzkdm(jyzkmc);
-        }
-        //学历
+               String mzdmmc = sysDictService.getCodeName(sysDictitem);
+               ryxx.setMzdmmc(mzdmmc);
+            }
+        /*//学历
         code = ryxx.getXldm();
         sysDictitem.setCode(code);
         sysDictitem.setGroupid("CODE_WHCD");
@@ -88,6 +86,30 @@ public class RyhxController {
             String xlmc = sysDictService.getCodeName(sysDictitem);
             ryxx.setXldm(xlmc);
         }
+            //职业
+            code = ryxx.getZylbdm();
+            sysDictitem.setCode(code);
+            sysDictitem.setGroupid("CODE_ZY");
+            if(code != null && !"".equals(code)){
+                String name = sysDictService.getCodeName(sysDictitem);
+                jbryxx.setZylbdm(name);
+            }
+            //籍贯
+            code = ryxx.getJgdm();
+            sysDictitem.setCode(code);
+            sysDictitem.setGroupid("CODE_UNIT");
+            if(code != null && !"".equals(code)){
+                String jgmc = sysDictService.getCodeName(sysDictitem);
+                jbryxx.setJgdm(jgmc);
+            }
+            //婚姻状况
+            code = ryxx.getJyzkdm();
+            sysDictitem.setCode(code);
+            sysDictitem.setGroupid("CODE_HYZK");
+            if(code != null && !"".equals(code)){
+                String jyzkmc = sysDictService.getCodeName(sysDictitem);
+                jbryxx.setJyzkdm(jyzkmc);
+            }*/
            }
         }catch (Exception e){
             e.printStackTrace();

src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@ spring:
   datasource:
     xzxt:
       driver-class-name: oracle.jdbc.driver.OracleDriver
-      username: XZXT
-      password: XZXT
-      url: jdbc:oracle:thin:@192.168.1.121:1521:cqxzSid
+      username: XZXTCQ
+      password: XZXTCQ
+      url: jdbc:oracle:thin:@192.168.0.104:1521:XZXT
     gxzxt:
       driver-class-name: oracle.jdbc.driver.OracleDriver
       username: XZXT

src/main/resources/application.yml

 spring:
   profiles:
-    active: prod
+    active: dev
   mvc:
     view:
       prefix: /WEB-INF/jsp/

src/main/webapp/WEB-INF/jsp/ryhx/ryhx.jsp

@@ -58,19 +58,19 @@
           </div>
         </div>--%>
         <!--一条折线对应一条内容，左侧-->
-        <div class="new1 animated pulse"><span class="zdm"><span class="birthdate">${ryxx.xm}</span></div>
+        <div class="new1 animated pulse"><span class="zdm"><span class="birthdate">姓名：${ryxx.xm}</span></div>
         <!--一条折线对应一条内容，左侧-->
-        <div class="new2 animated pulse"><span class="address">${ryxx.xbdm}</span></div>
+        <div class="new2 animated pulse"><span class="address">性别：${ryxx.xbdm}</span></div>
         <!--一条折线对应一条内容，左侧-->
-        <div class="new3 animated pulse"><span class="hjxx">${ryxx.lxdh}</span></div>
+        <div class="new3 animated pulse"><span class="hjxx">电话：${ryxx.lxdh}</span></div>
         <!--一条折线对应一条内容，左侧-->
-        <div class="new4 animated pulse"><span class="others1">${ryxx.jgdm}</span></div>
+        <div class="new4 animated pulse"><span class="others1">民族：${ryxx.mzdmmc}</span></div>
         <!--一条折线对应一条内容，左侧-->
-        <div class="new5 animated pulse"><span class="others2">${ryxx.hjdzDzmc}</span></div>
+        <div class="new5 animated pulse"><span class="others2">户籍地：${ryxx.csdDzmc}</span></div>
         <!--一条折线对应一条内容，左侧-->
-        <div class="new6 animated pulse"><span class="others3">${ryxx.jyzkdm}</span></div>
-        <div class="new7 animated pulse w69"><span class="others4">${ryxx.xldm}</span></div>
-        <div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>
+        <div class="new6 animated pulse"><span class="others3">现住地：${ryxx.xzzDzmc}</span></div>
+        <div class="new7 animated pulse w69"><span class="others4">常用证件号码：${ryxx.cyzjZjhm}</span></div>
+        <%--<div class="new8 animated pulse w69"><span class="others5">${ryxx.zylbdm}</span></div>--%>
       </div>
       <div id="content2" class="content" style="display:none;">
           <c:forEach var="xnxx" items="${relationInList}">