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
4f2d25e6
Commit
4f2d25e6
authored
Aug 29, 2022
by
zhaji
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"feature-zhaJi:修复减员创建人bug,新增orderNo字段"
parent
da8f6b9a
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
211 additions
and
45 deletions
+211
-45
TInsuranceDetail.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
+25
-1
TInsuranceRefund.java
...loud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java
+16
-0
InsuranceListOrderParam.java
...d/plus/v1/yifu/insurances/vo/InsuranceListOrderParam.java
+18
-0
InsuranceOrderBatchParam.java
.../plus/v1/yifu/insurances/vo/InsuranceOrderBatchParam.java
+17
-0
InsuranceOrderRefundParam.java
...plus/v1/yifu/insurances/vo/InsuranceOrderRefundParam.java
+22
-0
InsuranceOrderReplaceParam.java
...lus/v1/yifu/insurances/vo/InsuranceOrderReplaceParam.java
+17
-0
InsuranceRefundCheck.java
...loud/plus/v1/yifu/insurances/vo/InsuranceRefundCheck.java
+6
-0
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+8
-8
TInsuranceRefundMapper.java
.../insurances/mapper/insurances/TInsuranceRefundMapper.java
+2
-1
TInsuranceDetailService.java
...insurances/service/insurance/TInsuranceDetailService.java
+5
-5
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+35
-19
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+5
-1
TInsuranceRefundMapper.xml
...in/resources/mapper/insurances/TInsuranceRefundMapper.xml
+35
-10
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java
View file @
4f2d25e6
...
@@ -285,5 +285,29 @@ public class TInsuranceDetail extends BaseEntity {
...
@@ -285,5 +285,29 @@ public class TInsuranceDetail extends BaseEntity {
@Schema
(
description
=
"商险办理时间"
)
@Schema
(
description
=
"商险办理时间"
)
private
LocalDateTime
handledTime
;
private
LocalDateTime
handledTime
;
private
static
final
long
serialVersionUID
=
1L
;
/**
* 订单编号
*/
@Schema
(
description
=
"订单编号"
)
private
String
orderNo
;
/**
* 创建人所在部门
*/
@Schema
(
description
=
"创建人所在部门"
)
private
String
createUserDeptId
;
/**
* 创建人所在部门名称
*/
@Schema
(
description
=
"创建人所在部门名称"
)
private
String
createUserDeptName
;
private
static
final
long
serialVersionUID
=
1L
;
}
}
\ No newline at end of file
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java
View file @
4f2d25e6
...
@@ -32,6 +32,12 @@ public class TInsuranceRefund extends BaseEntity {
...
@@ -32,6 +32,12 @@ public class TInsuranceRefund extends BaseEntity {
@Schema
(
description
=
"保单信息主键"
)
@Schema
(
description
=
"保单信息主键"
)
private
String
insDetailId
;
private
String
insDetailId
;
/**
* 订单编号
*/
@Schema
(
description
=
"订单编号"
)
private
String
orderNo
;
/**
/**
* 减员状态
* 减员状态
*/
*/
...
@@ -56,7 +62,17 @@ public class TInsuranceRefund extends BaseEntity {
...
@@ -56,7 +62,17 @@ public class TInsuranceRefund extends BaseEntity {
@Schema
(
description
=
"是否删除 0否/1是"
)
@Schema
(
description
=
"是否删除 0否/1是"
)
private
Integer
deleteFlag
;
private
Integer
deleteFlag
;
/**
* 创建人所在部门
*/
@Schema
(
description
=
"创建人所在部门"
)
private
String
createUserDeptId
;
/**
* 创建人所在部门名称
*/
@Schema
(
description
=
"创建人所在部门名称"
)
private
String
createUserDeptName
;
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListOrderParam.java
0 → 100644
View file @
4f2d25e6
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author zhaji
* @description TODO
* @date 2022-08-29 11:57:55
*/
@Data
public
class
InsuranceListOrderParam
{
private
String
orderNo
;
private
List
<
InsuranceAddParam
>
data
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceOrderBatchParam.java
0 → 100644
View file @
4f2d25e6
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author zhaji
* @description TODO
* @date 2022-08-29 12:13:48
*/
@Data
public
class
InsuranceOrderBatchParam
{
private
String
orderNo
;
private
List
<
InsuranceBatchParam
>
data
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceOrderRefundParam.java
0 → 100644
View file @
4f2d25e6
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author zhaji
* @description TODO
* @date 2022-08-29 12:35:52
*/
@Data
public
class
InsuranceOrderRefundParam
{
/**
* 订单编号
*/
@Schema
(
description
=
"订单编号"
)
private
String
orderNo
;
private
List
<
InsuranceRefundCheck
>
data
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceOrderReplaceParam.java
0 → 100644
View file @
4f2d25e6
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
lombok.Data
;
import
java.util.List
;
/**
* @author zhaji
* @description TODO
* @date 2022-08-29 12:29:28
*/
@Data
public
class
InsuranceOrderReplaceParam
{
private
String
orderNo
;
private
List
<
InsuranceReplaceParam
>
data
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundCheck.java
View file @
4f2d25e6
...
@@ -23,6 +23,12 @@ public class InsuranceRefundCheck implements Serializable {
...
@@ -23,6 +23,12 @@ public class InsuranceRefundCheck implements Serializable {
@Schema
(
description
=
"主键"
)
@Schema
(
description
=
"主键"
)
private
String
id
;
private
String
id
;
/**
* 订单编号
*/
@Schema
(
description
=
"订单编号"
)
private
String
orderNo
;
/**
/**
* 员工姓名
* 员工姓名
*/
*/
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
4f2d25e6
...
@@ -118,7 +118,7 @@ public class TInsuranceDetailController {
...
@@ -118,7 +118,7 @@ public class TInsuranceDetailController {
*/
*/
@Operation
(
summary
=
"投保新增"
,
description
=
"投保新增"
)
@Operation
(
summary
=
"投保新增"
,
description
=
"投保新增"
)
@PostMapping
(
"/addInsurance"
)
@PostMapping
(
"/addInsurance"
)
public
R
<
List
<
InsuranceAddParam
>>
addInsurance
(
@RequestBody
@Valid
@Size
(
min
=
1
,
message
=
"集合不能为空"
)
List
<
InsuranceAddParam
>
paramList
){
public
R
<
List
<
InsuranceAddParam
>>
addInsurance
(
@RequestBody
InsuranceListOrderParam
paramList
){
return
tInsuranceDetailService
.
addInsurance
(
paramList
);
return
tInsuranceDetailService
.
addInsurance
(
paramList
);
}
}
...
@@ -131,7 +131,7 @@ public class TInsuranceDetailController {
...
@@ -131,7 +131,7 @@ public class TInsuranceDetailController {
*/
*/
@Operation
(
summary
=
"投保批增"
,
description
=
"投保批增"
)
@Operation
(
summary
=
"投保批增"
,
description
=
"投保批增"
)
@PostMapping
(
"/batchInsurance"
)
@PostMapping
(
"/batchInsurance"
)
public
R
<
List
<
InsuranceBatchParam
>>
batchInsurance
(
@RequestBody
@Valid
@Size
(
min
=
1
,
message
=
"集合不能为空"
)
List
<
InsuranceBatchParam
>
paramList
){
public
R
<
List
<
InsuranceBatchParam
>>
batchInsurance
(
@RequestBody
InsuranceOrderBatchParam
paramList
){
return
tInsuranceDetailService
.
batchInsurance
(
paramList
);
return
tInsuranceDetailService
.
batchInsurance
(
paramList
);
}
}
...
@@ -144,7 +144,7 @@ public class TInsuranceDetailController {
...
@@ -144,7 +144,7 @@ public class TInsuranceDetailController {
*/
*/
@Operation
(
summary
=
"投保替换"
,
description
=
"投保替换"
)
@Operation
(
summary
=
"投保替换"
,
description
=
"投保替换"
)
@PostMapping
(
"/replaceInsurance"
)
@PostMapping
(
"/replaceInsurance"
)
public
R
<
List
<
InsuranceReplaceParam
>>
replaceInsurance
(
@RequestBody
@Valid
@Size
(
min
=
1
,
message
=
"集合不能为空"
)
List
<
InsuranceReplaceParam
>
paramList
){
public
R
<
List
<
InsuranceReplaceParam
>>
replaceInsurance
(
@RequestBody
InsuranceOrderReplaceParam
paramList
){
return
tInsuranceDetailService
.
replaceInsurance
(
paramList
);
return
tInsuranceDetailService
.
replaceInsurance
(
paramList
);
}
}
...
@@ -280,15 +280,15 @@ public class TInsuranceDetailController {
...
@@ -280,15 +280,15 @@ public class TInsuranceDetailController {
}
}
/***********************减员办理********************************/
/***********************减员办理********************************/
/**
/**
* 导入减员
校验
* 导入减员
* @param
insuranceRefundCheckList
导入减员校验
* @param
param
导入减员校验
* @author zhaji
* @author zhaji
* @date 2022-07-19
* @date 2022-07-19
* @since v1.0
* @since v1.0
*/
*/
@PostMapping
(
"/saveInsuranceRefund"
)
@PostMapping
(
"/saveInsuranceRefund"
)
public
R
saveInsuranceRefund
(
@RequestBody
@Valid
@Size
(
min
=
1
,
message
=
"导入减员列表不能为空"
)
List
<
InsuranceRefundCheck
>
insuranceRefundCheckList
){
public
R
saveInsuranceRefund
(
@RequestBody
InsuranceOrderRefundParam
param
){
return
tInsuranceDetailService
.
saveInsuranceRefund
(
insuranceRefundCheckList
);
return
tInsuranceDetailService
.
saveInsuranceRefund
(
param
);
}
}
/**
/**
...
@@ -353,7 +353,7 @@ public class TInsuranceDetailController {
...
@@ -353,7 +353,7 @@ public class TInsuranceDetailController {
*/
*/
@Operation
(
summary
=
"已减员列表分页查询"
,
description
=
"已减员列表分页查询"
)
@Operation
(
summary
=
"已减员列表分页查询"
,
description
=
"已减员列表分页查询"
)
@PostMapping
(
"/getInsuranceRefundPageList"
)
@PostMapping
(
"/getInsuranceRefundPageList"
)
public
R
<
IPage
<
InsuranceRefundListVo
>>
getInsuranceRefundPageList
(
Page
<
InsuranceRefundParam
>
page
,
@RequestBody
InsuranceRefundParam
param
)
{
public
R
getInsuranceRefundPageList
(
Page
<
InsuranceRefundParam
>
page
,
@RequestBody
InsuranceRefundParam
param
)
{
return
tInsuranceDetailService
.
getInsuranceRefundPageList
(
page
,
param
);
return
tInsuranceDetailService
.
getInsuranceRefundPageList
(
page
,
param
);
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceRefundMapper.java
View file @
4f2d25e6
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
/**
/**
* @author Administrator
* @author Administrator
...
@@ -22,7 +23,7 @@ public interface TInsuranceRefundMapper extends BaseMapper<TInsuranceRefund> {
...
@@ -22,7 +23,7 @@ public interface TInsuranceRefundMapper extends BaseMapper<TInsuranceRefund> {
*/
*/
TInsuranceRefund
getByInsDetailId
(
String
id
);
TInsuranceRefund
getByInsDetailId
(
String
id
);
void
updateByInsDetailId
(
TInsuranceRefund
insuranceRefund
);
void
updateByInsDetailId
(
@Param
(
"param"
)
TInsuranceRefund
insuranceRefund
);
int
updateRefundMoney
(
TInsuranceRefund
insuranceRefund
);
int
updateRefundMoney
(
TInsuranceRefund
insuranceRefund
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @
4f2d25e6
...
@@ -75,7 +75,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -75,7 +75,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param paramList
* @param paramList
* @return {@link R<List<InsuranceAddParam>>}
* @return {@link R<List<InsuranceAddParam>>}
*/
*/
R
<
List
<
InsuranceAddParam
>>
addInsurance
(
List
<
InsuranceAddParam
>
paramList
);
R
<
List
<
InsuranceAddParam
>>
addInsurance
(
InsuranceListOrderParam
paramList
);
/**
/**
* 商险批增
* 商险批增
...
@@ -84,7 +84,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -84,7 +84,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param paramList
* @param paramList
* @return {@link R<List<InsuranceBatchParam>>}
* @return {@link R<List<InsuranceBatchParam>>}
*/
*/
R
<
List
<
InsuranceBatchParam
>>
batchInsurance
(
List
<
InsuranceBatchParam
>
paramList
);
R
<
List
<
InsuranceBatchParam
>>
batchInsurance
(
InsuranceOrderBatchParam
paramList
);
/**
/**
* 商险替换
* 商险替换
*
*
...
@@ -92,7 +92,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -92,7 +92,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* @param paramList
* @param paramList
* @return {@link R<List<InsuranceReplaceParam>>}
* @return {@link R<List<InsuranceReplaceParam>>}
*/
*/
R
<
List
<
InsuranceReplaceParam
>>
replaceInsurance
(
List
<
InsuranceReplaceParam
>
paramList
);
R
<
List
<
InsuranceReplaceParam
>>
replaceInsurance
(
InsuranceOrderReplaceParam
paramList
);
/**
/**
* 通过id删除
* 通过id删除
...
@@ -184,10 +184,10 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
...
@@ -184,10 +184,10 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
* 减员导入
* 减员导入
*
*
* @author zhaji
* @author zhaji
* @param
insuranceRefundCheckList
减员表
* @param
param
减员表
* @return {@link R}
* @return {@link R}
*/
*/
R
saveInsuranceRefund
(
List
<
InsuranceRefundCheck
>
insuranceRefundCheckList
);
R
saveInsuranceRefund
(
InsuranceOrderRefundParam
param
);
/**
/**
* 已投保列表分页查询
* 已投保列表分页查询
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
4f2d25e6
...
@@ -267,15 +267,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -267,15 +267,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
*/
*/
@Override
@Override
@Transactional
(
value
=
"insurancesTransactionManager"
,
rollbackFor
=
{
Exception
.
class
})
@Transactional
(
value
=
"insurancesTransactionManager"
,
rollbackFor
=
{
Exception
.
class
})
public
R
<
List
<
InsuranceAddParam
>>
addInsurance
(
List
<
InsuranceAddParam
>
paramList
)
{
public
R
<
List
<
InsuranceAddParam
>>
addInsurance
(
InsuranceListOrderParam
paramList
)
{
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
if
(
CollectionUtils
.
isEmpty
(
paramList
.
getData
()
)){
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
}
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
}
}
Map
<
String
,
List
<
InsuranceAddParam
>>
map
=
addInsuranceCheck
(
paramList
,
user
);
Map
<
String
,
List
<
InsuranceAddParam
>>
map
=
addInsuranceCheck
(
paramList
.
getData
()
,
user
);
//返回给前端的结果
//返回给前端的结果
List
<
InsuranceAddParam
>
listResult
=
map
.
get
(
"listResult"
);
List
<
InsuranceAddParam
>
listResult
=
map
.
get
(
"listResult"
);
//保存到数据库中的结果
//保存到数据库中的结果
...
@@ -286,7 +286,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -286,7 +286,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceDetail
detail
=
new
TInsuranceDetail
();
TInsuranceDetail
detail
=
new
TInsuranceDetail
();
BeanCopyUtils
.
copyProperties
(
success
,
detail
);
BeanCopyUtils
.
copyProperties
(
success
,
detail
);
//购买类型,默认为「新增」
//购买类型,默认为「新增」
detail
.
setOrderNo
(
paramList
.
getOrderNo
());
detail
.
setBuyType
(
CommonConstants
.
ONE_INT
);
detail
.
setBuyType
(
CommonConstants
.
ONE_INT
);
detail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
detail
.
setCreateUserDeptName
(
user
.
getDeptName
());
//投保状态:待投保
//投保状态:待投保
detail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
detail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
detail
.
setPolicyStart
(
LocalDateUtil
.
parseLocalDate
(
success
.
getPolicyStart
()));
detail
.
setPolicyStart
(
LocalDateUtil
.
parseLocalDate
(
success
.
getPolicyStart
()));
...
@@ -314,15 +317,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -314,15 +317,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
*/
*/
@Override
@Override
@Transactional
(
value
=
"insurancesTransactionManager"
,
rollbackFor
=
{
Exception
.
class
})
@Transactional
(
value
=
"insurancesTransactionManager"
,
rollbackFor
=
{
Exception
.
class
})
public
R
<
List
<
InsuranceBatchParam
>>
batchInsurance
(
List
<
InsuranceBatchParam
>
paramList
)
{
public
R
<
List
<
InsuranceBatchParam
>>
batchInsurance
(
InsuranceOrderBatchParam
paramList
)
{
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
if
(
CollectionUtils
.
isEmpty
(
paramList
.
getData
()
)){
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
}
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
}
}
Map
<
String
,
List
<
InsuranceBatchParam
>>
map
=
batchInsuranceCheck
(
paramList
,
user
);
Map
<
String
,
List
<
InsuranceBatchParam
>>
map
=
batchInsuranceCheck
(
paramList
.
getData
()
,
user
);
//返回给前端的结果
//返回给前端的结果
List
<
InsuranceBatchParam
>
listResult
=
map
.
get
(
"listResult"
);
List
<
InsuranceBatchParam
>
listResult
=
map
.
get
(
"listResult"
);
//保存到数据库中的结果
//保存到数据库中的结果
...
@@ -337,6 +340,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -337,6 +340,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//投保状态:待投保
//投保状态:待投保
detail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
detail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
//保费都默认是0
//保费都默认是0
detail
.
setOrderNo
(
paramList
.
getOrderNo
());
detail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
detail
.
setCreateUserDeptName
(
user
.
getDeptName
());
detail
.
setActualPremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setActualPremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setEstimatePremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setEstimatePremium
(
new
BigDecimal
(
"0.00"
));
detail
.
setCreateBy
(
user
.
getId
());
detail
.
setCreateBy
(
user
.
getId
());
...
@@ -359,15 +365,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -359,15 +365,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
*/
*/
@Override
@Override
@Transactional
(
value
=
"insurancesTransactionManager"
,
rollbackFor
=
{
Exception
.
class
})
@Transactional
(
value
=
"insurancesTransactionManager"
,
rollbackFor
=
{
Exception
.
class
})
public
R
<
List
<
InsuranceReplaceParam
>>
replaceInsurance
(
List
<
InsuranceReplaceParam
>
paramList
)
{
public
R
<
List
<
InsuranceReplaceParam
>>
replaceInsurance
(
InsuranceOrderReplaceParam
paramList
)
{
if
(
CollectionUtils
.
isEmpty
(
paramList
)){
if
(
CollectionUtils
.
isEmpty
(
paramList
.
getData
()
)){
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
}
}
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
if
(
user
==
null
||
Common
.
isEmpty
(
user
.
getId
()))
{
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
return
R
.
failed
(
CommonConstants
.
PLEASE_LOG_IN
);
}
}
Map
<
String
,
List
<
InsuranceReplaceParam
>>
map
=
replaceInsuranceCheck
(
paramList
,
user
);
Map
<
String
,
List
<
InsuranceReplaceParam
>>
map
=
replaceInsuranceCheck
(
paramList
.
getData
()
,
user
);
//返回给前端的结果
//返回给前端的结果
List
<
InsuranceReplaceParam
>
listResult
=
map
.
get
(
"listResult"
);
List
<
InsuranceReplaceParam
>
listResult
=
map
.
get
(
"listResult"
);
//保存到数据库中的结果
//保存到数据库中的结果
...
@@ -397,6 +403,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -397,6 +403,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
this
.
updateById
(
detail
);
this
.
updateById
(
detail
);
//新数据置为待办理
//新数据置为待办理
newDetail
.
setId
(
null
);
newDetail
.
setId
(
null
);
newDetail
.
setOrderNo
(
paramList
.
getOrderNo
());
newDetail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
newDetail
.
setBuyHandleStatus
(
CommonConstants
.
ONE_INT
);
newDetail
.
setBuyType
(
CommonConstants
.
FOUR_INT
);
newDetail
.
setBuyType
(
CommonConstants
.
FOUR_INT
);
newDetail
.
setEmpName
(
success
.
getReplaceEmpName
());
newDetail
.
setEmpName
(
success
.
getReplaceEmpName
());
...
@@ -410,6 +417,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -410,6 +417,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
newDetail
.
setIsUse
(
null
);
newDetail
.
setIsUse
(
null
);
newDetail
.
setIsEffect
(
null
);
newDetail
.
setIsEffect
(
null
);
newDetail
.
setReduceHandleStatus
(
null
);
newDetail
.
setReduceHandleStatus
(
null
);
newDetail
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
newDetail
.
setCreateUserDeptName
(
user
.
getDeptName
());
newDetail
.
setSignFlag
(
CommonConstants
.
ZERO_INT
);
newDetail
.
setSignFlag
(
CommonConstants
.
ZERO_INT
);
//创建时间是新数据插入时间
//创建时间是新数据插入时间
newDetail
.
setCreateTime
(
LocalDateTime
.
now
());
newDetail
.
setCreateTime
(
LocalDateTime
.
now
());
...
@@ -2874,16 +2883,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -2874,16 +2883,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* 减员导入
* 减员导入
*
*
* @author zhaji
* @author zhaji
* @param
insuranceRefundCheckList
减员表
* @param
param
减员表
* @return {@link R}
* @return {@link R}
*/
*/
@Override
@Override
public
R
saveInsuranceRefund
(
List
<
InsuranceRefundCheck
>
insuranceRefundCheckList
)
{
public
R
saveInsuranceRefund
(
InsuranceOrderRefundParam
param
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(!
Common
.
isNotEmpty
(
insuranceRefundCheckList
)){
if
(!
Common
.
isNotEmpty
(
param
.
getData
()
)){
return
R
.
failed
(
"当前导入的减员信息为空"
);
return
R
.
failed
(
"当前导入的减员信息为空"
);
}
}
Map
<
String
,
List
<
InsuranceRefundCheck
>>
refundMap
=
checkInsuranceRefundList
(
insuranceRefundCheckList
,
user
);
Map
<
String
,
List
<
InsuranceRefundCheck
>>
refundMap
=
checkInsuranceRefundList
(
param
.
getData
()
,
user
);
List
<
InsuranceRefundCheck
>
successList
=
refundMap
.
get
(
"successList"
);
List
<
InsuranceRefundCheck
>
successList
=
refundMap
.
get
(
"successList"
);
List
<
TInsuranceOperate
>
operateList
=
new
ArrayList
<>();
List
<
TInsuranceOperate
>
operateList
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
successList
)){
if
(
CollectionUtils
.
isNotEmpty
(
successList
)){
...
@@ -2895,6 +2904,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -2895,6 +2904,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
insuranceRefund
.
setCreateBy
(
user
.
getId
());
insuranceRefund
.
setCreateBy
(
user
.
getId
());
insuranceRefund
.
setCreateName
(
user
.
getNickname
());
insuranceRefund
.
setCreateName
(
user
.
getNickname
());
insuranceRefund
.
setCreateTime
(
LocalDateTime
.
now
());
insuranceRefund
.
setCreateTime
(
LocalDateTime
.
now
());
insuranceRefund
.
setUpdateTime
(
LocalDateTime
.
now
());
insuranceRefund
.
setUpdateBy
(
user
.
getId
());
insuranceRefund
.
setOrderNo
(
param
.
getOrderNo
());
insuranceRefund
.
setCreateUserDeptId
(
user
.
getDeptId
().
toString
());
insuranceRefund
.
setCreateUserDeptName
(
user
.
getDeptName
());
if
(
StringUtils
.
isNotBlank
(
refund
.
getRemark
())){
if
(
StringUtils
.
isNotBlank
(
refund
.
getRemark
())){
insuranceRefund
.
setRemark
(
refund
.
getRemark
());
insuranceRefund
.
setRemark
(
refund
.
getRemark
());
}
}
...
@@ -3155,8 +3169,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3155,8 +3169,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detailList
.
add
(
detail
);
detailList
.
add
(
detail
);
refund
.
setInsDetailId
(
record
.
getId
());
refund
.
setInsDetailId
(
record
.
getId
());
refund
.
setReduceHandleStatus
(
CommonConstants
.
TWO_INT
);
refund
.
setReduceHandleStatus
(
CommonConstants
.
TWO_INT
);
refund
.
set
Cre
ateBy
(
user
.
getId
());
refund
.
set
Upd
ateBy
(
user
.
getId
());
refund
.
set
Cre
ateTime
(
LocalDateTime
.
now
());
refund
.
set
Upd
ateTime
(
LocalDateTime
.
now
());
refundList
.
add
(
refund
);
refundList
.
add
(
refund
);
}
}
}
}
...
@@ -3235,8 +3249,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3235,8 +3249,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
successList
.
add
(
tInsuranceDetail
);
successList
.
add
(
tInsuranceDetail
);
//更新减员记录
//更新减员记录
refund
.
setInsDetailId
(
tInsuranceDetail
.
getId
());
refund
.
setInsDetailId
(
tInsuranceDetail
.
getId
());
refund
.
set
Cre
ateBy
(
user
.
getId
());
refund
.
set
Upd
ateBy
(
user
.
getId
());
refund
.
set
Cre
ateTime
(
LocalDateTime
.
now
());
refund
.
set
Upd
ateTime
(
LocalDateTime
.
now
());
refund
.
setReduceHandleStatus
(
refundType
);
refund
.
setReduceHandleStatus
(
refundType
);
refundList
.
add
(
refund
);
refundList
.
add
(
refund
);
}
else
{
}
else
{
...
@@ -3281,8 +3295,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -3281,8 +3295,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
for
(
InsuranceHandleImportParam
param
:
successList
)
{
for
(
InsuranceHandleImportParam
param
:
successList
)
{
TInsuranceOperate
operate
=
new
TInsuranceOperate
();
TInsuranceOperate
operate
=
new
TInsuranceOperate
();
LambdaUpdateWrapper
<
TInsuranceRefund
>
refund
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TInsuranceRefund
>
refund
=
new
LambdaUpdateWrapper
<>();
refund
.
eq
(
TInsuranceRefund
::
getInsDetailId
,
param
.
getId
());
refund
.
eq
(
TInsuranceRefund
::
getInsDetailId
,
param
.
getId
())
refund
.
set
(
TInsuranceRefund
::
getRemark
,
param
.
getRemark
());
.
set
(
TInsuranceRefund
::
getRemark
,
param
.
getRemark
())
.
set
(
TInsuranceRefund
::
getUpdateTime
,
LocalDateTime
.
now
())
.
set
(
TInsuranceRefund
::
getUpdateBy
,
user
.
getId
());
LambdaUpdateWrapper
<
TInsuranceDetail
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TInsuranceDetail
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TInsuranceDetail:
:
getId
,
param
.
getId
())
updateWrapper
.
eq
(
TInsuranceDetail:
:
getId
,
param
.
getId
())
.
set
(
TInsuranceDetail:
:
getUpdateBy
,
user
.
getId
())
.
set
(
TInsuranceDetail:
:
getUpdateBy
,
user
.
getId
())
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
4f2d25e6
...
@@ -53,6 +53,9 @@
...
@@ -53,6 +53,9 @@
<result
property=
"deleteFlag"
column=
"DELETE_FLAG"
jdbcType=
"TINYINT"
/>
<result
property=
"deleteFlag"
column=
"DELETE_FLAG"
jdbcType=
"TINYINT"
/>
<result
property=
"handledBy"
column=
"HANDLED_BY"
jdbcType=
"VARCHAR"
/>
<result
property=
"handledBy"
column=
"HANDLED_BY"
jdbcType=
"VARCHAR"
/>
<result
property=
"handledTime"
column=
"HANDLED_TIME"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"handledTime"
column=
"HANDLED_TIME"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"orderNo"
column=
"ORDER_NO"
jdbcType=
"VARCHAR"
/>
<result
property=
"createUserDeptId"
column=
"CREATE_USER_DEPT_ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"createUserDeptName"
column=
"CREATE_USER_DEPT_NAME"
jdbcType=
"VARCHAR"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -67,7 +70,8 @@
...
@@ -67,7 +70,8 @@
BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
CREATE_BY,CREATE_NAME,CREATE_TIME,
CREATE_BY,CREATE_NAME,CREATE_TIME,
UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME
UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME,ORDER_NO,CREATE_USER_DEPT_ID,CREATE_USER_DEPT_NAME
</sql>
</sql>
<!--投保分页查询-->
<!--投保分页查询-->
<select
id=
"getInsuranceListPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"
>
<select
id=
"getInsuranceListPage"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO"
>
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceRefundMapper.xml
View file @
4f2d25e6
...
@@ -13,26 +13,51 @@
...
@@ -13,26 +13,51 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
jdbcType=
"VARCHAR"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
jdbcType=
"VARCHAR"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
jdbcType=
"VARCHAR"
/>
</resultMap>
<result
property=
"createBy"
column=
"CREATE_BY"
jdbcType=
"VARCHAR"
/>
<result
property=
"orderNo"
column=
"ORDER_NO"
jdbcType=
"VARCHAR"
/>
<result
property=
"createUserDeptId"
column=
"CREATE_USER_DEPT_ID"
jdbcType=
"VARCHAR"
/>
<result
property=
"createUserDeptName"
column=
"CREATE_USER_DEPT_NAME"
jdbcType=
"VARCHAR"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
ID,INS_DETAIL_ID,REDUCE_HANDLE_STATUS,
ID,INS_DETAIL_ID,REDUCE_HANDLE_STATUS,
REFUND_MONEY,REMARK,CREATE_TIME,
REFUND_MONEY,REMARK,CREATE_TIME,
CREATE_BY,CREATE_NAME
CREATE_BY,CREATE_NAME
,ORDER_NO,CREATE_USER_DEPT_ID,CREATE_USER_DEPT_NAME
</sql>
</sql>
<update
id=
"updateByInsDetailId"
>
<update
id=
"updateByInsDetailId"
>
update
update
t_insurance_refund
t_insurance_refund
set
set
REDUCE_HANDLE_STATUS = #{reduceHandleStatus},
<if
test=
"param.createName != null and param.createName.trim() != ''"
>
REMARK = #{remark},
CREATE_NAME= #{param.createName},
CREATE_NAME= #{createName},
</if>
CREATE_BY = #{createBy},
<if
test=
"param.createBy != null and param.createBy.trim() != ''"
>
CREATE_TIME = #{createTime},
CREATE_BY = #{param.createBy},
UPDATE_BY = #{createBy},
</if>
UPDATE_TIME = #{createTime}
<if
test=
"param.createTime != null"
>
CREATE_TIME = #{param.createTime},
</if>
<if
test=
"param.updateBy != null and param.updateBy.trim() != ''"
>
UPDATE_BY = #{param.updateBy},
</if>
<if
test=
"param.updateTime != null "
>
UPDATE_TIME = #{param.updateTime},
</if>
<if
test=
"param.createUserDeptName != null and param.createUserDeptName.trim() != ''"
>
CREATE_USER_DEPT_NAME= #{param.createUserDeptName},
</if>
<if
test=
"param.createUserDeptId != null and param.createUserDeptId.trim() != ''"
>
CREATE_USER_DEPT_ID = #{param.createUserDeptId},
</if>
<if
test=
"param.orderNo != null and param.orderNo.trim() != ''"
>
ORDER_NO = #{param.orderNo},
</if>
<if
test=
"param.remark != null and param.remark.trim() != ''"
>
REMARK = #{param.remark},
</if>
REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
where
where
INS_DETAIL_ID = #{insDetailId}
INS_DETAIL_ID = #{
param.
insDetailId}
</update>
</update>
<update
id=
"updateRefundMoney"
>
<update
id=
"updateRefundMoney"
>
update
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