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
6062ad80
You need to sign in or sign up before continuing.
Commit
6062ad80
authored
Apr 15, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
离职确认优化-fxj
parent
def24911
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
22 deletions
+11
-22
EmployeeRegistrationLeaveServiceImpl.java
...sp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
+11
-5
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+0
-17
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationLeaveServiceImpl.java
View file @
6062ad80
...
...
@@ -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
(
"状态不是待确认"
);
...
...
@@ -1169,9 +1173,11 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
BaseSearchListVO
baseSearchListVO
=
new
BaseSearchListVO
();
baseSearchListVO
.
setListParam
(
paramVoList
);
insuranceDaprUtil
.
updateInsurancePreRenewToIsLeaveList
(
baseSearchListVO
);
// 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标“可替换”
updateInsuranceReplaceTagByBatch
(
paramVoList
,
user
.
getNickname
(),
user
.
getId
());
//不勾选商险后 离职确认后,对该人员在该项目下的已投保未过期且有效的商险数据进行打标"可替换"
if
(
Common
.
isNotNull
(
vo
.
getDoTypeInsurance
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
vo
.
getDoTypeInsurance
()))
{
updateInsuranceReplaceTagByBatch
(
paramVoList
,
user
.
getNickname
(),
user
.
getId
());
}
}
if
(
errorMessageList
.
isEmpty
())
{
return
R
.
ok
();
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
6062ad80
...
...
@@ -1081,23 +1081,6 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
false
// 不抛出异常,允许返回 null
);
if
(
null
!=
insuranceDetail
)
{
try
{
// 设置替换标签为"可替换"
insuranceDetail
.
setReplaceTag
(
InsurancesConstants
.
INSURANCE_REPLACE_TAG_REPLACE
);
// 构建替换说明:时间 + 操作人员 + 原因
String
operateTime
=
DateUtil
.
dateToString
(
new
Date
(),
DateUtil
.
DATETIME_PATTERN_MINUTE
);
String
operator
=
Common
.
isEmpty
(
preVo
.
getOperator
())
?
"系统"
:
preVo
.
getOperator
();
String
replaceRemark
=
String
.
format
(
"%s-客服%s-对人员进行离职确认操作"
,
operateTime
,
operator
);
insuranceDetail
.
setReplaceRemark
(
replaceRemark
);
// 更新数据库
detailService
.
updateById
(
insuranceDetail
);
}
catch
(
Exception
e
)
{
log
.
error
(
"更新商险替换标签失败,商险 ID: {}"
,
insuranceDetail
.
getId
(),
e
);
throw
new
RuntimeException
(
"更新商险替换标签失败:"
+
e
.
getMessage
());
}
}
}
// 状态,0待确认,1待派单,2派单失败,3待投保,4投保中,5投保退回,6已完成,7待缴费
...
...
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