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
c05990ae
Commit
c05990ae
authored
Apr 03, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
可替换标签退回恢复优化-fxj
parent
129d0dcf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
1 deletion
+25
-1
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+7
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+18
-1
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
c05990ae
...
...
@@ -453,6 +453,13 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"可替换说明"
)
private
String
replaceRemark
;
/**
* 可替换说明备份 (用于退保时恢复)
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@Schema
(
description
=
"可替换说明备份"
)
private
String
replaceRemarkBak
;
/**
* 差额 settleId
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
c05990ae
...
...
@@ -858,6 +858,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
BeanCopyUtils
.
copyProperties
(
detail
,
newDetail
);
detail
.
setIsEffect
(
CommonConstants
.
ONE_INT
);
detail
.
setIsOverdue
(
null
);
// 【调整】保存被替换人 A 的替换说明到备份字段 (不清空,用于后续退保时恢复)
if
(
StringUtils
.
isNotBlank
(
detail
.
getReplaceRemark
()))
{
detail
.
setReplaceRemarkBak
(
detail
.
getReplaceRemark
());
}
// 清空被替换数据的替换标签和说明
detail
.
setReplaceTag
(
null
);
detail
.
setReplaceRemark
(
null
);
...
...
@@ -1976,7 +1982,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setIsEffect
(
null
);
one
=
tInsuranceReplaceService
.
getOne
(
Wrappers
.<
TInsuranceReplace
>
query
().
lambda
()
.
eq
(
TInsuranceReplace:
:
getToInsuranceDetailId
,
detail
.
getId
())
//huyc-代码优化
,
取替换状态为成功的那一条数据
//huyc-代码优化
,
取替换状态为成功的那一条数据
.
eq
(
TInsuranceReplace:
:
getReplaceStatus
,
CommonConstants
.
ONE_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Optional
.
ofNullable
(
one
).
isPresent
()){
...
...
@@ -1988,6 +1994,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//被替换者激活
byId
.
setIsEffect
(
CommonConstants
.
ZERO_INT
);
byId
.
setIsOverdue
(
CommonConstants
.
ZERO_INT
);
// 【调整】从被替换人 A 自己的备份字段恢复标签信息
// 优先使用 A 自己的 replaceRemarkBak 值
if
(
StringUtils
.
isNotBlank
(
byId
.
getReplaceRemarkBak
()))
{
byId
.
setReplaceRemark
(
byId
.
getReplaceRemarkBak
());
}
else
{
// 如果备份字段为空,使用默认值
byId
.
setReplaceRemark
(
"可替换"
);
}
byId
.
setReplaceTag
(
"可替换"
);
updList
.
add
(
byId
);
}
}
...
...
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