Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bigdatainterservice
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曹鹏
bigdatainterservice
Commits
a67c38c2
Commit
a67c38c2
authored
Apr 24, 2019
by
caojingji
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/master/zhuly_bate' into caopeng_bate1
parents
b0e5e30b
d293f4f8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
67 additions
and
38 deletions
+67
-38
META-INF/MANIFEST.MF
+3
-0
src/main/java/com/founder/interservice/model/AutoTbStRy.java
+4
-0
src/main/java/com/founder/interservice/ryhx/controller/RyhxController.java
+48
-26
src/main/resources/application-dev.yml
+3
-3
src/main/resources/application.yml
+1
-1
src/main/webapp/WEB-INF/jsp/ryhx/ryhx.jsp
+8
-8
No files found.
META-INF/MANIFEST.MF
0 → 100644
View file @
a67c38c2
Manifest-Version: 1.0
Main-Class: sun.rmi.server.Activation
src/main/java/com/founder/interservice/model/AutoTbStRy.java
View file @
a67c38c2
...
...
@@ -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
View file @
a67c38c2
...
...
@@ -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
jg
mc
=
sysDictService
.
getCodeName
(
sysDictitem
);
ryxx
.
setJgdm
(
jg
mc
);
String
hjdzDz
mc
=
sysDictService
.
getCodeName
(
sysDictitem
);
ryxx
.
setHjmc
(
hjdzDz
mc
);
}
//
婚姻状况
code
=
ryxx
.
get
Jyzk
dm
();
//
民族
code
=
ryxx
.
get
Mz
dm
();
sysDictitem
.
setCode
(
code
);
sysDictitem
.
setGroupid
(
"CODE_
HYZK
"
);
sysDictitem
.
setGroupid
(
"CODE_
MZ
"
);
if
(
code
!=
null
&&
!
""
.
equals
(
code
)){
String
jyzk
mc
=
sysDictService
.
getCodeName
(
sysDictitem
);
ryxx
.
setJyzkdm
(
jyzk
mc
);
}
//学历
String
mzdm
mc
=
sysDictService
.
getCodeName
(
sysDictitem
);
ryxx
.
setMzdmmc
(
mzdm
mc
);
}
/
*/
/学历
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
View file @
a67c38c2
...
...
@@ -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
:
XZXT
CQ
password
:
XZXT
CQ
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
View file @
a67c38c2
spring
:
profiles
:
active
:
prod
active
:
dev
mvc
:
view
:
prefix
:
/WEB-INF/jsp/
...
...
src/main/webapp/WEB-INF/jsp/ryhx/ryhx.jsp
View file @
a67c38c2
...
...
@@ -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.hjdz
Dzmc}
</span></div>
<div
class=
"new5 animated pulse"
><span
class=
"others2"
>
户籍地:${ryxx.csd
Dzmc}
</span></div>
<!--一条折线对应一条内容,左侧-->
<div
class=
"new6 animated pulse"
><span
class=
"others3"
>
${ryxx.jyzkdm
}
</span></div>
<div
class=
"new7 animated pulse w69"
><span
class=
"others4"
>
${ryxx.xld
m}
</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.cyzjZjh
m}
</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}"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment