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
a33e355b
Commit
a33e355b
authored
Apr 23, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入职确认接收和修改合同优化-fxj
parent
a211cf83
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
18 deletions
+26
-18
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+26
-18
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
a33e355b
...
...
@@ -326,6 +326,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
sb
.
append
(
"/合同"
);
}
}
//删除合同流程中信息
tContractPreDetailService
.
remove
(
Wrappers
.<
TContractPreDetail
>
lambdaQuery
()
.
eq
(
TContractPreDetail:
:
getRegisterId
,
updatePre
.
getId
()));
}
catch
(
Exception
e
)
{
log
.
error
(
"调用csp服务更新数据异常"
,
e
);
}
...
...
@@ -940,8 +943,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
//1.9.18合同流程中信息集合处理逻辑
if
(
employeeRegistrationPre
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
employeeRegistrationPre
.
getExitContractInfoList
())
if
(
employeeRegistrationPre
.
getServerItem
().
contains
(
"合同"
)
)
{
if
(
Common
.
isNotNull
(
employeeRegistrationPre
.
getExitContractInfoList
())
&&
!
employeeRegistrationPre
.
getExitContractInfoList
().
isEmpty
())
{
// 设置registerId
for
(
TContractPreDetailVo
contractDetail
:
employeeRegistrationPre
.
getExitContractInfoList
())
{
...
...
@@ -959,6 +962,11 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
detailList
.
add
(
detail
);
}
tContractPreDetailService
.
saveBatch
(
detailList
);
}
else
{
// 如果服务事项包含合同但exitContractInfoList为空,删除旧的合同流程中信息
tContractPreDetailService
.
remove
(
Wrappers
.<
TContractPreDetail
>
lambdaQuery
()
.
eq
(
TContractPreDetail:
:
getRegisterId
,
id
));
}
}
}
...
...
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