Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
f0990808
Commit
f0990808
authored
4 years ago
by
lal
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal
parents
30ba2901
2319f22c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+11
-2
src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java
+1
-1
No files found.
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
f0990808
...
...
@@ -45,6 +45,7 @@ import cn.hutool.core.bean.BeanUtil;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.date.BetweenFormater.Level
;
import
cn.hutool.core.date.DateField
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.io.IoUtil
;
import
cn.hutool.core.lang.tree.Tree
;
...
...
@@ -1697,7 +1698,7 @@ public class YgglController {
Integer
orgCode
=
userBean
.
getOrgCode
();
LoginInfoDto
loginInfo
=
LoginInfoDto
.
builder
().
build
();
YgglMainEmp
ygglMainEmp
=
new
LambdaQueryChainWrapper
<
YgglMainEmp
>(
ygglMainEmpMapper
)
.
select
(
YgglMainEmp:
:
getBmgwId
,
YgglMainEmp:
:
getName
,
YgglMainEmp:
:
getRzTime
,
YgglMainEmp:
:
getZzTime
,
.
select
(
YgglMainEmp:
:
getBmgwId
,
YgglMainEmp:
:
getName
,
YgglMainEmp:
:
getRzTime
,
YgglMainEmp:
:
getZzTime
,
YgglMainEmp:
:
getSyq
,
YgglMainEmp:
:
getEmpNum
)
.
eq
(
YgglMainEmp:
:
getEmpNum
,
empNum
).
eq
(
YgglMainEmp:
:
getOrgCode
,
orgCode
).
one
();
if
(
ygglMainEmp
!=
null
)
{
...
...
@@ -1720,7 +1721,15 @@ public class YgglController {
loginInfo
.
setGwId
(
gw
);
loginInfo
.
setGwName
(
gwObj
!=
null
?
gwObj
.
getName
()
:
""
);
loginInfo
.
setEntryTime
(
ygglMainEmp
.
getRzTime
());
loginInfo
.
setRegularTime
(
ygglMainEmp
.
getRzTime
());
if
(
ygglMainEmp
.
getSyq
()!=
null
)
{
System
.
out
.
println
(
ygglMainEmp
.
getSyq
());
Date
expireDate
=
DateUtil
.
offsetMonth
(
ygglMainEmp
.
getRzTime
(),
ygglMainEmp
.
getSyq
());
// 时间偏移
loginInfo
.
setRegularTime
(
expireDate
);
}
else
{
loginInfo
.
setRegularTime
(
new
Date
());
}
}
return
ResultUtil
.
data
(
loginInfo
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java
View file @
f0990808
...
...
@@ -69,7 +69,7 @@ public class SpmkCustomApprovalDto {
private
Integer
assoType
;
@NotNull
(
message
=
"isAllvisible为空"
)
@DecimalMax
(
value
=
"
1
"
,
message
=
"isAllvisible 只能为 0部分可见 1所有可见 2禁用"
)
@DecimalMax
(
value
=
"
2
"
,
message
=
"isAllvisible 只能为 0部分可见 1所有可见 2禁用"
)
@DecimalMin
(
value
=
"0"
,
message
=
"isAllvisible 只能为 0部分可见 1所有可见 2禁用"
)
@ApiModelProperty
(
value
=
"可见范围 0部分可见 1所有可见 2禁用"
,
example
=
"1"
)
private
Integer
isAllvisible
;
...
...
This diff is collapsed.
Click to expand it.
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