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
6e15ff7f
Commit
6e15ff7f
authored
Jun 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
0ca42287
fd15251c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
0 deletions
+15
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+15
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
6e15ff7f
...
...
@@ -554,6 +554,21 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
else
{
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
//撤销签署重新提交的话判断有没有合同待签订数据,有的话更新状态
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
tEmployeeContractInfo
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TEN_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
TWO_INT
)
{
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
}
else
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
ONE_INT
)
{
contractPre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
}
contractPre
.
setRevokeReason
(
""
);
contractPre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
}
baseMapper
.
updateById
(
tEmployeeContractInfo
);
}
...
...
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