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
bc9702e1
Commit
bc9702e1
authored
Aug 30, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"feature-zhaJi:修改商险减员新增逻辑,优化订单减员查询"
parent
e21a52e3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
13 deletions
+18
-13
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+6
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+4
-7
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+7
-5
TInsuranceRefundMapper.xml
...in/resources/mapper/insurances/TInsuranceRefundMapper.xml
+1
-1
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
bc9702e1
...
...
@@ -303,6 +303,12 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"创建人所在部门名称"
)
private
String
createUserDeptName
;
/**
* 减员id
*/
@Schema
(
description
=
"减员id"
)
private
String
refundId
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
bc9702e1
...
...
@@ -2920,14 +2920,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if
(
StringUtils
.
isNotBlank
(
refund
.
getRemark
())){
insuranceRefund
.
setRemark
(
refund
.
getRemark
());
}
if
(
null
==
refund
.
getReduceHandleStatus
()){
tInsuranceRefundService
.
save
(
insuranceRefund
);
}
else
{
tInsuranceRefundService
.
updateByInsDetailId
(
insuranceRefund
);
}
LambdaUpdateWrapper
<
TInsuranceDetail
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
set
(
TInsuranceDetail
::
getUpdateBy
,
user
.
getId
())
.
set
(
TInsuranceDetail
::
getUpdateTime
,
LocalDateTime
.
now
())
.
set
(
TInsuranceDetail
::
getRefundId
,
insuranceRefund
.
getId
())
.
set
(
TInsuranceDetail
::
getReduceHandleStatus
,
CommonConstants
.
ONE_INT
);
updateWrapper
.
eq
(
TInsuranceDetail
::
getId
,
refund
.
getId
());
update
(
updateWrapper
);
...
...
@@ -3175,7 +3172,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail
.
setUpdateTime
(
LocalDateTime
.
now
());
detail
.
setReduceHandleStatus
(
CommonConstants
.
TWO_INT
);
detailList
.
add
(
detail
);
refund
.
setI
nsDetailId
(
record
.
get
Id
());
refund
.
setI
d
(
detail
.
getRefund
Id
());
refund
.
setReduceHandleStatus
(
CommonConstants
.
TWO_INT
);
refund
.
setUpdateBy
(
user
.
getId
());
refund
.
setUpdateTime
(
LocalDateTime
.
now
());
...
...
@@ -3256,7 +3253,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
tInsuranceDetail
.
setUpdateTime
(
LocalDateTime
.
now
());
successList
.
add
(
tInsuranceDetail
);
//更新减员记录
refund
.
setI
nsDetailId
(
tInsuranceDetail
.
get
Id
());
refund
.
setI
d
(
tInsuranceDetail
.
getRefund
Id
());
refund
.
setUpdateBy
(
user
.
getId
());
refund
.
setUpdateTime
(
LocalDateTime
.
now
());
refund
.
setReduceHandleStatus
(
refundType
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
bc9702e1
...
...
@@ -585,7 +585,7 @@
where
detail.DELETE_FLAG = 0
and
detail.
ID = refund.INS_DETAIL_
ID
detail.
REFUND_ID = refund.
ID
and
detail.REDUCE_HANDLE_STATUS = 4
<if
test=
"param.empName != null and param.empName.trim() != ''"
>
...
...
@@ -649,7 +649,7 @@
t_insurance_detail detail,
t_insurance_refund refund
where
detail.
ID = refund.INS_DETAIL_
ID
detail.
REFUND_ID = refund.
ID
and
detail.DELETE_FLAG = 0
and
...
...
@@ -717,7 +717,7 @@
t_insurance_detail detail,
t_insurance_refund refund
where
detail.
ID = refund.INS_DETAIL_
ID
detail.
REFUND_ID = refund.
ID
<if
test=
"param.empName != null and param.empName.trim() != ''"
>
and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
</if>
...
...
@@ -781,7 +781,7 @@
where
detail.DELETE_FLAG = 0
and
detail.
ID = refund.INS_DETAIL_
ID
detail.
REFUND_ID = refund.
ID
and
detail.BUY_HANDLE_STATUS = 5
and
...
...
@@ -979,7 +979,7 @@
union all(
select
detail.id as id,
detail
.BUY_TYPE as buyType,
refund
.BUY_TYPE as buyType,
detail.EMP_NAME as empName,
detail.EMP_IDCARD_NO as empIdcardNo,
detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
...
...
@@ -997,6 +997,8 @@
t_insurance_refund refund
where
detail.DELETE_FLAG = 0
and
detail.ID = refund.INS_DETAIL_ID
and
refund.ORDER_NO = #{param.orderNo}
<if
test=
"param.empName != null and param.empName.trim() != ''"
>
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceRefundMapper.xml
View file @
bc9702e1
...
...
@@ -57,7 +57,7 @@
</if>
REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
where
I
NS_DETAIL_ID = #{param.insDetailI
d}
I
D = #{param.i
d}
</update>
<update
id=
"updateRefundMoney"
>
update
...
...
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