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
bf5c1781
Commit
bf5c1781
authored
Aug 15, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
e56ab73c
2141d2a8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
510 additions
and
330 deletions
+510
-330
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+28
-29
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+56
-9
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+8
-1
TEmployeeInsurancePre.java
...plus/v1/yifu/insurances/entity/TEmployeeInsurancePre.java
+3
-0
TInsurancePreDetail.java
...d/plus/v1/yifu/insurances/entity/TInsurancePreDetail.java
+26
-0
EmployeePreInsuranceListVo.java
...lus/v1/yifu/insurances/vo/EmployeePreInsuranceListVo.java
+1
-3
InsuranceAddParam.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java
+3
-0
InsuranceAutoParam.java
.../cloud/plus/v1/yifu/insurances/vo/InsuranceAutoParam.java
+10
-0
InsuranceBatchParam.java
...cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
+6
-5
InsuranceReplaceParam.java
...oud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
+3
-0
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+15
-2
TEmployeeInsurancePreQwDetailController.java
...s/controller/TEmployeeInsurancePreQwDetailController.java
+8
-0
TEmployeeInsurancePreService.java
...ances/service/insurance/TEmployeeInsurancePreService.java
+9
-1
ScheduleServiceImpl.java
...nsurances/service/insurance/impl/ScheduleServiceImpl.java
+1
-1
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+64
-21
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+261
-256
application.yml
...es/yifu-insurances-biz/src/main/resources/application.yml
+1
-0
TEmployeeInsurancePreMapper.xml
...sources/mapper/insurances/TEmployeeInsurancePreMapper.xml
+3
-1
TEmployeeInsurancePreQwDetailMapper.xml
...mapper/insurances/TEmployeeInsurancePreQwDetailMapper.xml
+1
-0
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+3
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
bf5c1781
...
...
@@ -567,12 +567,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
// 1:存在商险,判断合规性+日期+五个不同等:
if
(
Common
.
isNotNull
(
employeeRegistrationPre
.
getServerItem
())
&&
employeeRegistrationPre
.
getServerItem
().
contains
(
"商险"
))
{
//商险是否购买为
否
时增加校验
//商险是否购买为
是
时增加校验
if
(
Common
.
isNotNull
(
employeeRegistrationPre
.
getInsuranceIsBuy
())
&&
employeeRegistrationPre
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
employeeRegistrationPre
.
getExitInsuranceInfoList
().
isEmpty
())
{
//判断带出的流程中或者已完结的商险数据是否准确
//商险是否存在判断
employeeRegistrationPre
.
getExitInsuranceInfoList
().
forEach
(
e
->
e
.
setCreateTime
(
null
));
boolean
isTrue
=
checkInsuranceIsProcess
(
employeeRegistrationPre
);
if
(
isTrue
)
{
return
R
.
failed
(
"带出的商险已购买数据状态或条数发生变更,请重新确认!"
);
...
...
@@ -1425,36 +1426,34 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
EmployeeRegistrationPre
pre
=
this
.
getById
(
id
);
if
(
pre
!=
null
)
{
//判断合同是否已签订 是的话展示商险明细 否的话查询商险待购买数据
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
pre
.
getInsuranceIsBuy
()))
{
// 查已购买商险明细
R
<
EmployeePreInsuranceListVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
()
,
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/getExitInsuranceListByEmpPreId"
,
id
,
EmployeePreInsuranceListVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
&&
sdr
.
getData
().
getPreList
()
!=
null
&&
!
sdr
.
getData
().
getPreList
().
isEmpty
())
{
pre
.
setExitInsuranceInfoList
(
sdr
.
getData
().
getPreList
());
}
}
else
{
// 查原商险
R
<
EmployeePreLogListVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
()
,
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/getListByEmpPreId"
,
id
,
EmployeePreLogListVo
.
class
,
SecurityConstants
.
FROM_IN
);
List
<
TEmployeeInsurancePre
>
oldList
;
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
&&
sdr
.
getData
().
getPreList
()
!=
null
&&
!
sdr
.
getData
().
getPreList
().
isEmpty
())
{
oldList
=
sdr
.
getData
().
getPreList
();
for
(
TEmployeeInsurancePre
oldInsurance
:
oldList
)
{
if
(
Common
.
isNotNull
(
oldInsurance
.
getProcessStatus
())
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
||
CommonConstants
.
SIX_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())))
{
oldInsurance
.
setModelType
(
CommonConstants
.
FOUR_STRING
);
}
// 查已购买商险明细
R
<
EmployeePreInsuranceListVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
()
,
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/getExitInsuranceListByEmpPreId"
,
id
,
EmployeePreInsuranceListVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
&&
sdr
.
getData
().
getPreList
()
!=
null
&&
!
sdr
.
getData
().
getPreList
().
isEmpty
())
{
pre
.
setExitInsuranceInfoList
(
sdr
.
getData
().
getPreList
());
}
// 查原商险
R
<
EmployeePreLogListVo
>
sdrOld
=
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
()
,
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/getListByEmpPreId"
,
id
,
EmployeePreLogListVo
.
class
,
SecurityConstants
.
FROM_IN
);
List
<
TEmployeeInsurancePre
>
oldList
;
if
(
sdrOld
!=
null
&&
sdrOld
.
getData
()
!=
null
&&
sdrOld
.
getData
().
getPreList
()
!=
null
&&
!
sdrOld
.
getData
().
getPreList
().
isEmpty
())
{
oldList
=
sdrOld
.
getData
().
getPreList
();
for
(
TEmployeeInsurancePre
oldInsurance
:
oldList
)
{
if
(
Common
.
isNotNull
(
oldInsurance
.
getProcessStatus
())
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())
||
CommonConstants
.
SIX_STRING
.
equals
(
oldInsurance
.
getProcessStatus
())))
{
oldInsurance
.
setModelType
(
CommonConstants
.
FOUR_STRING
);
}
pre
.
setInsurancePreList
(
oldList
);
}
pre
.
setInsurancePreList
(
oldList
);
}
//获取合同待签订数据
TEmployeeContractPre
contract
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
bf5c1781
...
...
@@ -209,12 +209,18 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
newInfo
.
setAttaIdList
(
null
);
oldInfo
.
setAttaList
(
null
);
newInfo
.
setAttaList
(
null
);
//商险是否已购买list不做比较
oldInfo
.
setExitInsuranceInfoList
(
newInfo
.
getExitInsuranceInfoList
());
//比较记录不影响业务逻辑,用try套住
//记录商险是否已购买日志
String
isBuyOld
=
oldInfo
.
getInsuranceIsBuy
();
String
isBuyNew
=
newInfo
.
getInsuranceIsBuy
();
oldInfo
.
setInsuranceIsBuy
(
newInfo
.
getInsuranceIsBuy
());
//比较差异
String
differenceKey
=
HrEquator
.
comparisonValue
(
oldInfo
,
newInfo
);
//如果有差异保存差异
List
<
TEmployeeInsurancePre
>
newList
=
newInfo
.
getInsurancePreList
();
String
diffTitle
=
null
;
String
logId
=
String
.
valueOf
(
UUID
.
randomUUID
()).
replaceAll
(
"-"
,
""
);
// 要保存的明细
...
...
@@ -225,7 +231,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
&&
!
"attaIdList"
.
equals
(
differenceKey
)
&&
!
"employeeContractPre"
.
equals
(
differenceKey
))
{
differenceKey
=
differenceKey
.
replace
(
"insurancePreList"
,
""
);
differenceKey
=
differenceKey
.
replace
(
"employeeContractPre"
,
""
);
differenceKey
=
differenceKey
.
replace
(
"exitInsuranceInfoList"
,
""
);
diffTitle
=
"档案信息"
;
detailEmpLog
=
new
TEmployeePreLogDetail
();
detailEmpLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
...
...
@@ -238,18 +243,41 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
oldMap
=
new
HashMap
<>();
}
List
<
TEmployeeInsurancePre
>
saveOrUpdateList
=
new
ArrayList
<>();
// 是否修改了商险
boolean
isModifyInsurance
=
false
;
TEmployeeInsurancePre
oldInsurance
;
String
differenceInsuranceKey
;
TEmployeePreLogDetail
detailInsuranceLog
;
if
(
Common
.
isEmpty
(
isBuyOld
)
||
(
Common
.
isNotNull
(
isBuyOld
)
&&
!
isBuyOld
.
equals
(
isBuyNew
)))
{
//单独记录是否已购买商险的变更记录
differenceInsuranceKey
=
"insuranceIsBuy"
;
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
Map
<
String
,
Object
>
old
=
new
HashMap
<>();
old
.
put
(
"insuranceIsBuy"
,
isBuyOld
);
Map
<
String
,
Object
>
simNew
=
new
HashMap
<>();
simNew
.
put
(
"insuranceIsBuy"
,
isBuyNew
);
this
.
setLogBaseInfo
(
empPreId
,
old
,
simNew
,
user
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
//如果服务类型包含商险处理商险明细数据
if
(
Common
.
isNotNull
(
newInfo
.
getServerItem
())
&&
newInfo
.
getServerItem
().
contains
(
"商险"
))
{
newInfo
.
setId
(
empPreId
);
if
(!
newInfo
.
getExitInsuranceInfoList
().
isEmpty
())
{
newInfo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
empPreId
));
}
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
()
,
"/temployeeinsurancepre/inner/updateInfoSaveInsurancePreInfo"
,
newInfo
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
if
(
newList
!=
null
&&
!
newList
.
isEmpty
())
{
// 是否修改了商险
boolean
isModifyInsurance
=
false
;
TEmployeeInsurancePre
oldInsurance
;
String
differenceInsuranceKey
;
TEmployeePreLogDetail
detailInsuranceLog
;
for
(
TEmployeeInsurancePre
newInsurance
:
newList
)
{
differenceInsuranceKey
=
null
;
if
(
Common
.
isNotNull
(
newInsurance
.
getModelType
()))
{
// 1:新增
if
(
CommonConstants
.
ONE_STRING
.
equals
(
newInsurance
.
getModelType
()))
{
saveOrUpdateList
.
add
(
newInsurance
);
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
newInsurance
.
getModelType
());
...
...
@@ -403,6 +431,12 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
newInfo
.
setAttaIdList
(
null
);
oldInfo
.
setAttaList
(
null
);
newInfo
.
setAttaList
(
null
);
//记录商险是否已购买日志
String
isBuyOld
=
oldInfo
.
getInsuranceIsBuy
();
String
isBuyNew
=
newInfo
.
getInsuranceIsBuy
();
//商险是否已购买list不做比较
oldInfo
.
setExitInsuranceInfoList
(
newInfo
.
getExitInsuranceInfoList
());
oldInfo
.
setInsuranceIsBuy
(
newInfo
.
getInsuranceIsBuy
());
//比较记录不影响业务逻辑,用try套住
//比较差异
String
differenceKey
=
HrEquator
.
comparisonValue
(
oldInfo
,
newInfo
);
...
...
@@ -419,7 +453,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
&&
!
"attaIdList"
.
equals
(
differenceKey
)
&&
!
"employeeContractPre"
.
equals
(
differenceKey
))
{
differenceKey
=
differenceKey
.
replace
(
"insurancePreList"
,
""
);
differenceKey
=
differenceKey
.
replace
(
"employeeContractPre"
,
""
);
differenceKey
=
differenceKey
.
replace
(
"exitInsuranceInfoList"
,
""
);
diffTitle
=
"档案信息二次确认"
;
detailEmpLog
=
new
TEmployeePreLogDetail
();
detailEmpLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
...
...
@@ -433,6 +466,20 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
TEmployeeInsurancePre
oldInsurance
;
String
differenceInsuranceKey
;
TEmployeePreLogDetail
detailInsuranceLog
;
if
(
Common
.
isEmpty
(
isBuyOld
)
||(
Common
.
isNotNull
(
isBuyOld
)
&&
!
isBuyOld
.
equals
(
isBuyNew
)))
{
//单独记录是否已购买商险的变更记录
differenceInsuranceKey
=
"insuranceIsBuy"
;
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
CommonConstants
.
TWO_STRING
);
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
Map
<
String
,
Object
>
old
=
new
HashMap
<>();
old
.
put
(
"insuranceIsBuy"
,
isBuyOld
);
Map
<
String
,
Object
>
simNew
=
new
HashMap
<>();
simNew
.
put
(
"insuranceIsBuy"
,
isBuyNew
);
this
.
setPreLogBaseInfo
(
empPreId
,
old
,
simNew
,
userId
,
nickName
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
}
for
(
TEmployeeInsurancePre
newInsurance
:
newList
)
{
differenceInsuranceKey
=
null
;
if
(
CommonConstants
.
THREE_STRING
.
equals
(
newInsurance
.
getModelType
()))
{
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
bf5c1781
...
...
@@ -626,6 +626,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
&&
!
preVo
.
getExitInsuranceInfoList
().
isEmpty
())
{
//判断带出的流程中或者已完结的商险数据是否准确
//商险是否存在判断
preVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
preVo
.
getExitInsuranceInfoList
().
forEach
(
e
->
e
.
setCreateTime
(
null
));
boolean
isTrue
=
checkInsuranceIsProcess
(
preVo
);
if
(
isTrue
)
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
"带出的商险已购买数据状态或条数发生变更,请重新确认接收!"
);
...
...
@@ -665,7 +667,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
domainR
.
getData
()));
//生成入职确认信息商险明细数据
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
else
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
}
else
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
preVo
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ONE_STRING
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
for
(
TEmployeeInsurancePreVo
insurancePreVo
:
preVo
.
getEmployeeInsurancePreVos
())
{
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
...
...
@@ -978,6 +982,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
TEmployeeInsurancePreVo
insurancePreVo
=
preVo
.
getEmployeeInsurancePreVos
().
get
(
0
);
//批量的商险是否已购买默认为否
preVo
.
setInsuranceIsBuy
(
CommonConstants
.
ONE_STRING
);
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
...
...
@@ -1121,6 +1127,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
Common
.
isNotNull
(
preVo
.
getInsuranceIsBuy
())
&&
preVo
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
preVo
.
getExitInsuranceInfoList
().
isEmpty
())
{
preVo
.
getExitInsuranceInfoList
().
forEach
(
e
->
e
.
setCreateTime
(
null
));
preVo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
domainR
.
getData
()));
//生成入职确认信息商险明细数据
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TEmployeeInsurancePre.java
View file @
bf5c1781
...
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -151,6 +152,8 @@ public class TEmployeeInsurancePre extends BaseEntity {
private
String
errorInfo
;
@Schema
(
description
=
"发起失败时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonIgnore
private
LocalDateTime
errorTime
;
@TableField
(
exist
=
false
)
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsurancePreDetail.java
View file @
bf5c1781
...
...
@@ -2,8 +2,10 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -96,6 +98,7 @@ public class TInsurancePreDetail extends BaseEntity {
@ExcelAttribute
(
name
=
"保单开始时间"
,
isDate
=
true
)
@ExcelProperty
(
"保单开始时间"
)
@Schema
(
description
=
"保单开始时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
policyStart
;
/**
* 保单结束时间
...
...
@@ -103,6 +106,7 @@ public class TInsurancePreDetail extends BaseEntity {
@ExcelAttribute
(
name
=
"保单结束时间"
,
isDate
=
true
)
@ExcelProperty
(
"保单结束时间"
)
@Schema
(
description
=
"保单结束时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
policyEnd
;
/**
* 保单生效日期
...
...
@@ -110,6 +114,7 @@ public class TInsurancePreDetail extends BaseEntity {
@ExcelAttribute
(
name
=
"保单生效日期"
,
isDate
=
true
)
@ExcelProperty
(
"保单生效日期"
)
@Schema
(
description
=
"保单生效日期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
policyEffect
;
/**
* 投保类型, 1新增、3批增、4替换
...
...
@@ -166,4 +171,25 @@ public class TInsurancePreDetail extends BaseEntity {
@Schema
(
description
=
"入离职登记id"
)
private
String
registerId
;
/**
* 商险购买地省
*/
@Schema
(
description
=
"商险购买地省"
)
private
String
insuranceProvinceName
;
/**
* 商险购买地市
*/
@Schema
(
description
=
"商险购买地市"
)
private
String
insuranceCityName
;
/**
* 派单时间
*/
@ExcelAttribute
(
name
=
"派单时间"
,
isDate
=
true
)
@ExcelProperty
(
"派单时间"
)
@Schema
(
description
=
"派单时间"
)
@TableField
(
exist
=
false
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+08:00"
)
private
Date
disTime
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EmployeePreInsuranceListVo.java
View file @
bf5c1781
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
...
...
@@ -18,6 +16,6 @@ import java.util.List;
@Schema
(
description
=
"商险自动化已购买商险明细VO"
)
public
class
EmployeePreInsuranceListVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
628032758008497542L
;
private
List
<
TInsurancePreDetail
>
preList
=
new
ArrayList
<>()
;
private
List
<
TInsurancePreDetail
>
preList
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java
View file @
bf5c1781
...
...
@@ -202,6 +202,9 @@ public class InsuranceAddParam implements Serializable {
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
@Schema
(
description
=
"投标类型"
)
private
Integer
buyType
;
@Schema
(
description
=
"客户id"
)
private
String
unitId
;
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAutoParam.java
View file @
bf5c1781
...
...
@@ -27,6 +27,16 @@ public class InsuranceAutoParam implements Serializable {
*/
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
/**
* 项目名称
*/
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
/**
* 投标类型
*/
@Schema
(
description
=
"投标类型"
)
private
Integer
buyType
;
/**
* 员工姓名
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
View file @
bf5c1781
...
...
@@ -190,15 +190,19 @@ public class InsuranceBatchParam implements Serializable {
/**
* 保单开始时间
*/
@JsonIgnore
private
LocalDate
policyStart
;
/**
* 保单结束时间
*/
@JsonIgnore
private
LocalDate
policyEnd
;
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
@Schema
(
description
=
"投标类型"
)
private
Integer
buyType
;
/**
* EKP的 是否BPO: 是 否
*/
...
...
@@ -206,9 +210,6 @@ public class InsuranceBatchParam implements Serializable {
@ExcelIgnore
private
String
bpoFlag
;
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
@Schema
(
description
=
"客户id"
)
private
String
unitId
;
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
View file @
bf5c1781
...
...
@@ -138,6 +138,9 @@ public class InsuranceReplaceParam implements Serializable {
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
@Schema
(
description
=
"投标类型"
)
private
Integer
buyType
;
@Schema
(
description
=
"客户id"
)
private
String
unitId
;
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreController.java
View file @
bf5c1781
...
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
...
...
@@ -159,8 +160,8 @@ public class TEmployeeInsurancePreController {
**/
@Operation
(
description
=
"商险派单信息单个/批量派单"
)
@PostMapping
(
"/batchDispatcherInsurance"
)
public
R
batchDispatcherInsurance
(
@RequestBody
List
<
String
>
idList
)
{
return
tEmployeeInsurancePreService
.
batchDispatcherInsurance
(
idList
,
null
);
public
R
batchDispatcherInsurance
(
@RequestBody
List
<
String
>
idList
,
@RequestParam
(
required
=
false
)
String
isExit
)
{
return
tEmployeeInsurancePreService
.
batchDispatcherInsurance
(
idList
,
isExit
,
false
);
}
/**
...
...
@@ -187,6 +188,18 @@ public class TEmployeeInsurancePreController {
return
tEmployeeInsurancePreService
.
saveInsurancePreInfo
(
preVo
);
}
/**
* 信息修改入口新增商险已购买明细
* @author huych
* @date 2025-08-14 11:46:16
**/
@Operation
(
description
=
"信息修改入口新增商险已购买明细"
)
@Inner
@PostMapping
(
"/inner/updateInfoSaveInsurancePreInfo"
)
public
Boolean
updateInfoSaveInsurancePreInfo
(
@RequestBody
EmployeeRegistrationPre
pre
)
{
return
tEmployeeInsurancePreService
.
updateInfoSaveInsurancePreInfo
(
pre
);
}
/**
* 商险状态是否正常判断
* @author huych
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreQwDetailController.java
View file @
bf5c1781
...
...
@@ -19,6 +19,8 @@ package com.yifu.cloud.plus.v1.yifu.insurances.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePreQwDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TEmployeeInsurancePreQwDetailService
;
...
...
@@ -54,6 +56,12 @@ public class TEmployeeInsurancePreQwDetailController {
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
TEmployeeInsurancePreQwDetail
>>
getTEmployeeInsurancePreQwDetailPage
(
Page
<
TEmployeeInsurancePreQwDetail
>
page
,
TEmployeeInsurancePreQwDetail
tEmployeeInsurancePreQwDetail
)
{
if
(
tEmployeeInsurancePreQwDetail
==
null
)
{
tEmployeeInsurancePreQwDetail
=
new
TEmployeeInsurancePreQwDetail
();
}
if
(
Common
.
isEmpty
(
tEmployeeInsurancePreQwDetail
.
getMainId
()))
{
tEmployeeInsurancePreQwDetail
.
setMainId
(
CommonConstants
.
ZERO_STRING
);
}
return
new
R
<>(
tEmployeeInsurancePreQwDetailService
.
getTEmployeeInsurancePreQwDetailPage
(
page
,
tEmployeeInsurancePreQwDetail
));
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TEmployeeInsurancePreService.java
View file @
bf5c1781
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
...
...
@@ -59,7 +60,7 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
* @param sameFlag 是否要做重复人员明细校验的标识 1 不需要 空需要
* @return
*/
R
batchDispatcherInsurance
(
List
<
String
>
idList
,
String
sameFlag
);
R
batchDispatcherInsurance
(
List
<
String
>
idList
,
String
sameFlag
,
boolean
pushQiWeiFlag
);
/**
* 新增商险待购买信息
...
...
@@ -68,6 +69,13 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
*/
Boolean
saveInsurancePreInfo
(
EmployeeRegistrationPreVo
preVo
);
/**
* 信息修改入口新增商险待购买信息
* @param pre
* @return
*/
Boolean
updateInfoSaveInsurancePreInfo
(
EmployeeRegistrationPre
pre
);
Boolean
checkExitInsuanceIsProcess
(
EmployeeRegistrationPreVo
preVo
);
TEmployeeInsuranceSelectVo
selectInsurancePreInfoList
(
TEmployeeInsurancePreVo
preVo
);
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/ScheduleServiceImpl.java
View file @
bf5c1781
...
...
@@ -53,7 +53,7 @@ public class ScheduleServiceImpl implements ScheduleService {
transactionTemplate
.
execute
(
status
->
{
List
<
String
>
idList
=
new
ArrayList
<>();
idList
.
add
(
aId
);
insurancePreService
.
batchDispatcherInsurance
(
idList
,
CommonConstants
.
ONE_STRING
);
insurancePreService
.
batchDispatcherInsurance
(
idList
,
CommonConstants
.
ONE_STRING
,
false
);
return
null
;
});
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
bf5c1781
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
bf5c1781
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/resources/application.yml
View file @
bf5c1781
...
...
@@ -40,6 +40,7 @@ security:
-
/actuator/**
-
/swagger-ui/**
-
/insuranceDetail/urgentUpdateIsUse
-
/temployeeinsurancepreqwdetail/page
# 文件上传相关 支持阿里云、华为云、腾讯、minio
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TEmployeeInsurancePreMapper.xml
View file @
bf5c1781
...
...
@@ -48,6 +48,8 @@
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"registTime"
column=
"regist_time"
/>
<result
property=
"registUser"
column=
"regist_user"
/>
<result
property=
"errorInfo"
column=
"error_info"
/>
<result
property=
"errorTime"
column=
"error_time"
/>
</resultMap>
<resultMap
id=
"tEmployeeInsurancePreExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreExportVo"
>
...
...
@@ -101,7 +103,7 @@
a.create_name,
a.create_time,
a.update_by,
a.update_time,a.policy_no,a.config_name,a.policy_effect,a.insurances_id,a.regist_time,a.regist_user,a.config_id
a.update_time,a.policy_no,a.config_name,a.policy_effect,a.insurances_id,a.regist_time,a.regist_user,a.config_id
,a.error_info,a.error_time
</sql>
<sql
id=
"tEmployeeInsurancePre_where"
>
<if
test=
"tEmployeeInsurancePre != null"
>
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TEmployeeInsurancePreQwDetailMapper.xml
View file @
bf5c1781
...
...
@@ -75,5 +75,6 @@
1=1
<include
refid=
"tEmployeeInsurancePreQwDetail_where"
/>
</where>
order by a.id
</select>
</mapper>
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
bf5c1781
...
...
@@ -614,7 +614,9 @@
a.CREATE_NAME as createName,
a.UNIT_NAME as unitName,
a.UNIT_NO as unitNo,
a.IS_ADRESS as isAdress
a.IS_ADRESS as isAdress,
a.INSURANCE_PROVINCE_NAME as insuranceProvinceName,
a.INSURANCE_CITY_NAME as insuranceCityName
from
t_insurance_detail a
where
...
...
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