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
a38d5ad4
Commit
a38d5ad4
authored
Apr 14, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
867cf7e2
b13eb3fb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+6
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+0
-6
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
a38d5ad4
...
...
@@ -913,8 +913,12 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
paramVo
.
setDeptNo
(
registrationOld
.
getDeptNo
());
insuranceDaprUtil
.
updateInsurancePreRenewToIsLeave
(
paramVo
);
// 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换”
updateInsuranceReplaceTagBySingle
(
registrationOld
.
getEmpIdcard
(),
registrationOld
.
getDeptNo
(),
user
.
getNickname
(),
user
.
getId
());
//不勾选商险后 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换”
if
(
Common
.
isNotNull
(
leave
.
getDoType
()))
{
if
(!
leave
.
getDoType
().
contains
(
CommonConstants
.
THREE_STRING
))
{
updateInsuranceReplaceTagBySingle
(
registrationOld
.
getEmpIdcard
(),
registrationOld
.
getDeptNo
(),
user
.
getNickname
(),
user
.
getId
());
}
}
return
R
.
ok
();
}
else
{
return
R
.
failed
(
"状态不是待确认"
);
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
a38d5ad4
...
...
@@ -1402,12 +1402,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
continue
;
}
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
if
(
CommonConstants
.
THREE_STRING
.
equals
(
registration
.
getProcessStatus
()))
{
exitCheckVo
.
setType
(
preVo
.
getServerItem
());
exitCheckVo
.
setErrorMsg
(
"已拒绝入职,不可操作!"
);
errorList
.
add
(
exitCheckVo
);
continue
;
}
//批量的商险是否已购买默认为否
if
(
Common
.
isEmpty
(
preVo
.
getInsuranceIsBuy
()))
{
preVo
.
setInsuranceIsBuy
(
CommonConstants
.
ONE_STRING
);
...
...
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