Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
404aa084
Commit
404aa084
authored
Dec 26, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同申请提交拦截
parent
db56e5d0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+4
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
404aa084
...
@@ -216,9 +216,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -216,9 +216,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.
eq
(
TEmployeeContractInfo:
:
getDeptNo
,
tEmployeeContractInfo
.
getDeptNo
())
.
eq
(
TEmployeeContractInfo:
:
getDeptNo
,
tEmployeeContractInfo
.
getDeptNo
())
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
contractInfo
!=
null
&&
(
contractInfo
.
getContractEnd
()
==
null
if
(
contractInfo
==
null
)
{
return
R
.
failed
(
"无在用合同,无法续签"
);
}
else
if
(
contractInfo
.
getContractEnd
()
==
null
||
!(
DateUtil
.
formatDate
(
DateUtil
.
addDayByDate
(
contractInfo
.
getContractEnd
(),
1
)).
equals
(
DateUtil
.
formatDate
(
tEmployeeContractInfo
.
getContractStart
())))
||
!(
DateUtil
.
formatDate
(
DateUtil
.
addDayByDate
(
contractInfo
.
getContractEnd
(),
1
)).
equals
(
DateUtil
.
formatDate
(
tEmployeeContractInfo
.
getContractStart
())))
)
)
{
)
{
return
R
.
failed
(
"续签请注意上一份合同的截止日期!"
);
return
R
.
failed
(
"续签请注意上一份合同的截止日期!"
);
}
}
}
else
if
(
EmployeeConstants
.
SITUATION_THREE
.
equals
(
tEmployeeContractInfo
.
getSituation
()))
{
}
else
if
(
EmployeeConstants
.
SITUATION_THREE
.
equals
(
tEmployeeContractInfo
.
getSituation
()))
{
...
...
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