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
6d86183e
Commit
6d86183e
authored
Jul 22, 2020
by
yangliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加人员新增3天内是否采集过该人的判断
parent
01c3a91c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
3 deletions
+33
-3
src/main/java/com/founder/controller/TbXwRycjController.java
+3
-2
src/main/resources/templates/rygl/ryxxlist.html
+30
-1
No files found.
src/main/java/com/founder/controller/TbXwRycjController.java
View file @
6d86183e
...
@@ -197,7 +197,7 @@ public class TbXwRycjController {
...
@@ -197,7 +197,7 @@ public class TbXwRycjController {
}
}
@RequestMapping
(
"/toAddRyxx"
)
@RequestMapping
(
"/toAddRyxx"
)
public
String
toAddRyxx
(
Model
model
,
String
perurl
,
HttpServletRequest
request
){
public
String
toAddRyxx
(
Model
model
,
String
perurl
,
String
gmsfzh
,
HttpServletRequest
request
){
String
ips
=
""
;
String
ips
=
""
;
try
{
try
{
ips
=
SysUitl
.
getIp
(
request
);
ips
=
SysUitl
.
getIp
(
request
);
...
@@ -206,6 +206,7 @@ public class TbXwRycjController {
...
@@ -206,6 +206,7 @@ public class TbXwRycjController {
}
}
//String mac = SysUitl.getMac(ips);
//String mac = SysUitl.getMac(ips);
AutoTbStRy
xyrC
=
new
AutoTbStRy
();
AutoTbStRy
xyrC
=
new
AutoTbStRy
();
xyrC
.
setGmsfhm
(
gmsfzh
);
User
user
=
(
User
)
request
.
getSession
().
getAttribute
(
"User"
);
User
user
=
(
User
)
request
.
getSession
().
getAttribute
(
"User"
);
model
.
addAttribute
(
"username"
,
user
.
getUsername
());
model
.
addAttribute
(
"username"
,
user
.
getUsername
());
model
.
addAttribute
(
"unitcode"
,
user
.
getUnitcode
());
model
.
addAttribute
(
"unitcode"
,
user
.
getUnitcode
());
...
@@ -2866,7 +2867,7 @@ public class TbXwRycjController {
...
@@ -2866,7 +2867,7 @@ public class TbXwRycjController {
{
{
Calendar
ca
=
Calendar
.
getInstance
();
//得到一个Calendar的实例
Calendar
ca
=
Calendar
.
getInstance
();
//得到一个Calendar的实例
ca
.
setTime
(
new
Date
());
//设置时间为当前时间
ca
.
setTime
(
new
Date
());
//设置时间为当前时间
ca
.
add
(
Calendar
.
DATE
,
-
1
);
//天份减1
ca
.
add
(
Calendar
.
DATE
,
-
3
);
//天份减3
Date
lastday
=
ca
.
getTime
();
//结果
Date
lastday
=
ca
.
getTime
();
//结果
return
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
lastday
);
return
new
SimpleDateFormat
(
"yyyy-MM-dd"
).
format
(
lastday
);
}
}
...
...
src/main/resources/templates/rygl/ryxxlist.html
View file @
6d86183e
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
<input
type=
"hidden"
id=
"webappurl"
name=
"webappurl"
th:value=
"${webappurl}"
/>
<input
type=
"hidden"
id=
"webappurl"
name=
"webappurl"
th:value=
"${webappurl}"
/>
<input
type=
"hidden"
id=
"username"
name=
"username"
th:value=
"${username}"
/>
<input
type=
"hidden"
id=
"username"
name=
"username"
th:value=
"${username}"
/>
<input
type=
"hidden"
id=
"cxqssj"
th:value=
"${cxqssj}"
/>
<input
type=
"hidden"
id=
"cxqssj"
th:value=
"${cxqssj}"
/>
<input
type=
"hidden"
id=
"ifxz"
value=
"0"
/>
<form
name=
"ryxxForm"
>
<form
name=
"ryxxForm"
>
<table
style=
"width:100%;border-collapse: collapse;background-color: rgba(255,255,255,0.75);text-align:left;"
class=
"cx_table_tj_zljc"
>
<table
style=
"width:100%;border-collapse: collapse;background-color: rgba(255,255,255,0.75);text-align:left;"
class=
"cx_table_tj_zljc"
>
<tr>
<tr>
...
@@ -579,6 +580,13 @@
...
@@ -579,6 +580,13 @@
pageList
:
[
10
,
20
,
50
,
100
,
200
],
//rows
pageList
:
[
10
,
20
,
50
,
100
,
200
],
//rows
pageNumber
:
1
,
pageNumber
:
1
,
loadFilter
:
function
(
data
){
loadFilter
:
function
(
data
){
var
ifxz
=
$
(
"#ifxz"
).
val
();
if
(
ifxz
==
"1"
&&
data
!=
null
&&
data
.
total
>
0
){
$
.
messager
.
alert
(
'提示'
,
"该人员在近3天内录入过人员信息,请在列表中选择该人员信息进行修改操作!"
);
}
else
if
(
ifxz
==
"1"
){
addpage
();
}
$
(
"#ifxz"
).
val
(
"0"
);
return
data
;
return
data
;
}
}
});
});
...
@@ -802,6 +810,26 @@
...
@@ -802,6 +810,26 @@
}
}
//新增
//新增
function
toAddpage
(){
function
toAddpage
(){
var
zjhm
=
$
(
"#zjhm"
).
val
();
if
(
zjhm
==
null
||
zjhm
==
""
){
$
.
messager
.
alert
(
'提示'
,
"请在查询条件中输入需要采集人员的身份证号码,如无身份证号请填写“无”!"
);
return
;
}
else
{
var
reg
=
/^
[
1-9
]([
0-9
]{14}
|
[
0-9X
]{17})
$/
if
(
zjhm
!=
"无"
&&!
reg
.
test
(
zjhm
)){
$
.
messager
.
alert
(
'提示'
,
"请输入正确的身份证号!"
);
return
-
1
;
}
else
{
$
(
"#flrsjStr"
).
datebox
(
"setValue"
,
$
(
"#cxqssj"
).
val
());
$
(
"#ifxz"
).
val
(
"1"
);
doQuery
();
}
}
}
//新增
function
addpage
(){
var
zjhm
=
$
(
"#zjhm"
).
val
();
var
perurl
=
$
(
"#perurl"
).
html
();
var
perurl
=
$
(
"#perurl"
).
html
();
if
(
perurl
.
indexOf
(
"sbqx"
)
>=
0
){
if
(
perurl
.
indexOf
(
"sbqx"
)
>=
0
){
perurl
=
0
perurl
=
0
...
@@ -809,8 +837,9 @@
...
@@ -809,8 +837,9 @@
perurl
=
1
perurl
=
1
}
}
//var url = "openIE:"+$("#webappurl").val()+"/toHome?asjxgrybh=,"+$("#username").val()+"";
//var url = "openIE:"+$("#webappurl").val()+"/toHome?asjxgrybh=,"+$("#username").val()+"";
var
url
=
"/toAddRyxx?perurl="
+
perurl
;
var
url
=
"/toAddRyxx?perurl="
+
perurl
+
"&gmsfzh="
+
zjhm
;
window
.
open
(
url
);
window
.
open
(
url
);
}
}
//新增
//新增
function
pop
(){
function
pop
(){
...
...
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