Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hnxtbaboot
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
杨亮
hnxtbaboot
Commits
4d9acc52
Commit
4d9acc52
authored
Oct 28, 2021
by
wuchengwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
万里红虹膜提示语修改
parent
00873e79
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
96 additions
and
41 deletions
+96
-41
hnxtba-core/src/main/resources/static/hmcj/js/hmcj_wlh.js
+16
-2
hnxtba-interface/src/main/java/com/founder/controller/HmCjTsController.java
+70
-39
hnxtba-interface/src/main/java/com/founder/model/TbStHm.java
+9
-0
hnxtba-interface/src/main/resources/mapper/HmSqlMapper.xml
+1
-0
No files found.
hnxtba-core/src/main/resources/static/hmcj/js/hmcj_wlh.js
View file @
4d9acc52
...
...
@@ -196,9 +196,23 @@ function wlhhmts(){
layer
.
confirm
(
'<span style="color: red">'
+
data
.
message
+
'</span>'
,{
icon
:
7
,
title
:
'警告提示'
});
}
else
{
if
(
data
.
message
==
null
||
data
.
message
==
""
){
layer
.
confirm
(
'<span style="color: red">'
+
data
.
result
.
xxms
+
'</span>'
,{
icon
:
2
,
title
:
'推送错误提示'
});
layer
.
confirm
(
'<span style="color: red">'
+
data
.
result
.
xxms
+
'</span>'
,{
icon
:
2
,
title
:
'推送错误提示'
},
function
()
{
if
(
data
.
message
.
search
(
"不合格"
)
!=
-
1
)
{
startIris
(
'lefteyeimg'
,
'righteyeimg'
,
'3'
)
layer
.
closeAll
(
'dialog'
);
}
else
{
layer
.
closeAll
(
'dialog'
);
}
});
}
else
{
layer
.
confirm
(
'<span style="color: red">'
+
data
.
message
+
'</span>'
,{
icon
:
2
,
title
:
'推送错误提示'
});
layer
.
confirm
(
'<span style="color: red">'
+
data
.
message
+
'</span>'
,{
icon
:
2
,
title
:
'推送错误提示'
},
function
()
{
if
(
data
.
message
.
search
(
"不合格"
)
!=
-
1
)
{
startIris
(
'lefteyeimg'
,
'righteyeimg'
,
'3'
)
layer
.
closeAll
(
'dialog'
);
}
else
{
layer
.
closeAll
(
'dialog'
);
}
});
}
}
// window.close();
...
...
hnxtba-interface/src/main/java/com/founder/controller/HmCjTsController.java
View file @
4d9acc52
...
...
@@ -10,6 +10,7 @@ import com.founder.service.IParamService;
import
com.founder.service.LoginService
;
import
com.founder.service.RycjService
;
import
com.founder.utils.DateFormatUtils
;
import
com.founder.utils.DateUtil
;
import
com.founder.utils.FileUtils
;
import
org.apache.commons.codec.binary.Base64
;
import
org.apache.commons.lang.StringUtils
;
...
...
@@ -971,22 +972,30 @@ public class HmCjTsController {
res
.
put
(
"zjbz"
,
"1"
);
res
.
put
(
"lrbz"
,
"2"
);
res
.
put
(
"qzcjbz"
,
"0"
);
res
.
put
(
"bcjr_zjlxdm"
,
"111"
);
if
(
"无"
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
())
||
"无"
.
equals
(
hmxxs
.
get
(
0
).
getZjhm
())||
(
StringUtils
.
isBlank
(
hmxxs
.
get
(
0
).
getGmsfhm
())
&&
StringUtils
.
isBlank
(
hmxxs
.
get
(
0
).
getZjhm
()))){
res
.
put
(
"bcjr_zjlxdm"
,
"999"
);
}
else
{
res
.
put
(
"bcjr_zjlxdm"
,
"111"
);
}
String
sfzh
=
""
;
if
(
hmxxs
.
get
(
0
).
getGmsfhm
()
==
null
||
""
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
()))
{
if
(
hmxxs
.
get
(
0
).
getGmsfhm
()==
null
||
""
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
()))
{
sfzh
=
hmxxs
.
get
(
0
).
getZjhm
();
}
else
{
}
else
{
sfzh
=
hmxxs
.
get
(
0
).
getGmsfhm
();
}
res
.
put
(
"bcjr_zjhm"
,
sfzh
);
res
.
put
(
"bcjr_xm"
,
hmxxs
.
get
(
0
).
getXm
());
res
.
put
(
"bcjr_xb"
,
hmxxs
.
get
(
0
).
getXbdm
());
if
(
sfzh
!=
null
&&
sfzh
.
length
()
>
14
)
{
res
.
put
(
"bcjr_csrq"
,
sfzh
.
substring
(
6
,
14
));
}
else
{
res
.
put
(
"bcjr_csrq"
,
""
);
res
.
put
(
"bcjr_zjhm"
,
sfzh
);
res
.
put
(
"bcjr_xm"
,
hmxxs
.
get
(
0
).
getXm
());
res
.
put
(
"bcjr_xb"
,
hmxxs
.
get
(
0
).
getXbdm
());
if
(
sfzh
!=
null
&&
sfzh
.
length
()>
14
){
res
.
put
(
"bcjr_csrq"
,
sfzh
.
substring
(
6
,
10
)+
"-"
+
sfzh
.
substring
(
10
,
12
)+
"-"
+
sfzh
.
substring
(
12
,
14
));
}
else
{
res
.
put
(
"bcjr_csrq"
,
hmxxs
.
get
(
0
).
getCsrqQsrq
());
}
if
(
StringUtils
.
isNotBlank
(
hmxxs
.
get
(
0
).
getMzdm
())){
res
.
put
(
"bcjr_mz"
,
hmxxs
.
get
(
0
).
getMzdm
());
}
else
{
res
.
put
(
"bcjr_mz"
,
"98"
);
}
res
.
put
(
"bcjr_mz"
,
hmxxs
.
get
(
0
).
getMzdm
());
res
.
put
(
"bcjr_gj"
,
hmxxs
.
get
(
0
).
getGjdm
());
res
.
put
(
"bcjr_zjqfjg"
,
""
);
res
.
put
(
"bcjr_zjyxqx"
,
""
);
...
...
@@ -1118,22 +1127,30 @@ public class HmCjTsController {
res
.
put
(
"zjbz"
,
"1"
);
res
.
put
(
"lrbz"
,
"2"
);
res
.
put
(
"qzcjbz"
,
"0"
);
res
.
put
(
"bcjr_zjlxdm"
,
"111"
);
if
(
"无"
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
())
||
"无"
.
equals
(
hmxxs
.
get
(
0
).
getZjhm
())||
(
StringUtils
.
isBlank
(
hmxxs
.
get
(
0
).
getGmsfhm
())
&&
StringUtils
.
isBlank
(
hmxxs
.
get
(
0
).
getZjhm
()))){
res
.
put
(
"bcjr_zjlxdm"
,
"999"
);
}
else
{
res
.
put
(
"bcjr_zjlxdm"
,
"111"
);
}
String
sfzh
=
""
;
if
(
hmxxs
.
get
(
0
).
getGmsfhm
()
==
null
||
""
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
()))
{
if
(
hmxxs
.
get
(
0
).
getGmsfhm
()==
null
||
""
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
()))
{
sfzh
=
hmxxs
.
get
(
0
).
getZjhm
();
}
else
{
}
else
{
sfzh
=
hmxxs
.
get
(
0
).
getGmsfhm
();
}
res
.
put
(
"bcjr_zjhm"
,
sfzh
);
res
.
put
(
"bcjr_xm"
,
hmxxs
.
get
(
0
).
getXm
());
res
.
put
(
"bcjr_xb"
,
hmxxs
.
get
(
0
).
getXbdm
());
if
(
sfzh
!=
null
&&
sfzh
.
length
()
>
14
)
{
res
.
put
(
"bcjr_csrq"
,
sfzh
.
substring
(
6
,
14
));
}
else
{
res
.
put
(
"bcjr_csrq"
,
""
);
res
.
put
(
"bcjr_zjhm"
,
sfzh
);
res
.
put
(
"bcjr_xm"
,
hmxxs
.
get
(
0
).
getXm
());
res
.
put
(
"bcjr_xb"
,
hmxxs
.
get
(
0
).
getXbdm
());
if
(
sfzh
!=
null
&&
sfzh
.
length
()>
14
){
res
.
put
(
"bcjr_csrq"
,
sfzh
.
substring
(
6
,
10
)+
"-"
+
sfzh
.
substring
(
10
,
12
)+
"-"
+
sfzh
.
substring
(
12
,
14
));
}
else
{
res
.
put
(
"bcjr_csrq"
,
hmxxs
.
get
(
0
).
getCsrqQsrq
());
}
if
(
StringUtils
.
isNotBlank
(
hmxxs
.
get
(
0
).
getMzdm
())){
res
.
put
(
"bcjr_mz"
,
hmxxs
.
get
(
0
).
getMzdm
());
}
else
{
res
.
put
(
"bcjr_mz"
,
"98"
);
}
res
.
put
(
"bcjr_mz"
,
hmxxs
.
get
(
0
).
getMzdm
());
res
.
put
(
"bcjr_gj"
,
hmxxs
.
get
(
0
).
getGjdm
());
res
.
put
(
"bcjr_zjqfjg"
,
""
);
res
.
put
(
"bcjr_zjyxqx"
,
""
);
...
...
@@ -1268,9 +1285,13 @@ public class HmCjTsController {
res
.
put
(
"zjbz"
,
"1"
);
res
.
put
(
"lrbz"
,
"2"
);
res
.
put
(
"qzcjbz"
,
"1"
);
res
.
put
(
"bcjr_zjlxdm"
,
"111"
);
if
(
"无"
.
equals
(
xyrC
.
getGmsfhm
())
||
"无"
.
equals
(
xyrC
.
getZjhm
())||
(
StringUtils
.
isBlank
(
xyrC
.
getGmsfhm
())
&&
StringUtils
.
isBlank
(
xyrC
.
getZjhm
()))){
res
.
put
(
"bcjr_zjlxdm"
,
"999"
);
}
else
{
res
.
put
(
"bcjr_zjlxdm"
,
"111"
);
}
String
sfzh
=
""
;
if
(
xyrC
.
getGmsfhm
()==
null
||
""
.
equals
(
xyrC
.
getGmsfhm
())){
if
(
xyrC
.
getGmsfhm
()==
null
||
""
.
equals
(
xyrC
.
getGmsfhm
())){
sfzh
=
xyrC
.
getZjhm
();
}
else
{
sfzh
=
xyrC
.
getGmsfhm
();
...
...
@@ -1281,10 +1302,13 @@ public class HmCjTsController {
if
(
sfzh
!=
null
&&
sfzh
.
length
()>
14
){
res
.
put
(
"bcjr_csrq"
,
sfzh
.
substring
(
6
,
10
)+
"-"
+
sfzh
.
substring
(
10
,
12
)+
"-"
+
sfzh
.
substring
(
12
,
14
));
}
else
{
res
.
put
(
"bcjr_csrq"
,
""
);
res
.
put
(
"bcjr_csrq"
,
DateFormatUtils
.
dateToStr
(
xyrC
.
getCsrqQsrq
()));
}
if
(
StringUtils
.
isNotBlank
(
xyrC
.
getMzdm
())){
res
.
put
(
"bcjr_mz"
,
xyrC
.
getMzdm
());
}
else
{
res
.
put
(
"bcjr_mz"
,
"98"
);
}
res
.
put
(
"bcjr_mz"
,
xyrC
.
getMzdm
());
res
.
put
(
"bcjr_gj"
,
xyrC
.
getGjdm
());
res
.
put
(
"bcjr_zjqfjg"
,
""
);
res
.
put
(
"bcjr_zjyxqx"
,
""
);
...
...
@@ -1410,23 +1434,30 @@ public class HmCjTsController {
res
.
put
(
"zjbz"
,
"1"
);
res
.
put
(
"lrbz"
,
"2"
);
res
.
put
(
"qzcjbz"
,
"1"
);
res
.
put
(
"bcjr_zjlxdm"
,
"111"
);
if
(
"无"
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
())
||
"无"
.
equals
(
hmxxs
.
get
(
0
).
getZjhm
())||
(
StringUtils
.
isBlank
(
hmxxs
.
get
(
0
).
getGmsfhm
())
&&
StringUtils
.
isBlank
(
hmxxs
.
get
(
0
).
getZjhm
()))){
res
.
put
(
"bcjr_zjlxdm"
,
"999"
);
}
else
{
res
.
put
(
"bcjr_zjlxdm"
,
"111"
);
}
String
sfzh
=
""
;
if
(
hmxxs
.
get
(
0
).
getGmsfhm
()
==
null
||
""
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
()))
{
if
(
hmxxs
.
get
(
0
).
getGmsfhm
()==
null
||
""
.
equals
(
hmxxs
.
get
(
0
).
getGmsfhm
()))
{
sfzh
=
hmxxs
.
get
(
0
).
getZjhm
();
}
else
{
}
else
{
sfzh
=
hmxxs
.
get
(
0
).
getGmsfhm
();
}
res
.
put
(
"bcjr_zjhm"
,
sfzh
);
res
.
put
(
"bcjr_xm"
,
hmxxs
.
get
(
0
).
getXm
());
res
.
put
(
"bcjr_xb"
,
hmxxs
.
get
(
0
).
getXbdm
());
if
(
sfzh
!=
null
&&
sfzh
.
length
()
>
14
)
{
res
.
put
(
"bcjr_csrq"
,
sfzh
.
substring
(
6
,
10
)
+
"-"
+
sfzh
.
substring
(
10
,
12
)
+
"-"
+
sfzh
.
substring
(
12
,
14
));
}
else
{
res
.
put
(
"bcjr_csrq"
,
""
);
res
.
put
(
"bcjr_zjhm"
,
sfzh
);
res
.
put
(
"bcjr_xm"
,
hmxxs
.
get
(
0
).
getXm
());
res
.
put
(
"bcjr_xb"
,
hmxxs
.
get
(
0
).
getXbdm
());
if
(
sfzh
!=
null
&&
sfzh
.
length
()>
14
){
res
.
put
(
"bcjr_csrq"
,
sfzh
.
substring
(
6
,
10
)+
"-"
+
sfzh
.
substring
(
10
,
12
)+
"-"
+
sfzh
.
substring
(
12
,
14
));
}
else
{
res
.
put
(
"bcjr_csrq"
,
hmxxs
.
get
(
0
).
getCsrqQsrq
());
}
if
(
StringUtils
.
isNotBlank
(
hmxxs
.
get
(
0
).
getMzdm
())){
res
.
put
(
"bcjr_mz"
,
hmxxs
.
get
(
0
).
getMzdm
());
}
else
{
res
.
put
(
"bcjr_mz"
,
"98"
);
}
res
.
put
(
"bcjr_mz"
,
hmxxs
.
get
(
0
).
getMzdm
());
res
.
put
(
"bcjr_gj"
,
hmxxs
.
get
(
0
).
getGjdm
());
res
.
put
(
"bcjr_zjqfjg"
,
""
);
res
.
put
(
"bcjr_zjyxqx"
,
""
);
...
...
hnxtba-interface/src/main/java/com/founder/model/TbStHm.java
View file @
4d9acc52
...
...
@@ -81,6 +81,15 @@ public class TbStHm extends User implements Serializable {
private
String
lxdm2
;
private
String
sfts
;
//是否推送
private
String
tsjgmx
;
//推送结果描述
private
String
csrqQsrq
;
//出生日期
public
String
getCsrqQsrq
()
{
return
csrqQsrq
;
}
public
void
setCsrqQsrq
(
String
csrqQsrq
)
{
this
.
csrqQsrq
=
csrqQsrq
;
}
public
String
getTsjgmx
()
{
return
tsjgmx
;
...
...
hnxtba-interface/src/main/resources/mapper/HmSqlMapper.xml
View file @
4d9acc52
...
...
@@ -132,6 +132,7 @@
cj.XZZ_XZQHDM as xzzXzqhdm,
cj.LXDM as lxdm,
cj.LXDM2 as lxdm2,
to_char(cj.CSRQ_QSRQ,'yyyyMM') as csrqQsrq,
u.USERNAME as username,
u.UNITCODE as unitcode,
u.TRUE_NAME as trueName,
...
...
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