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
65707b1d
Commit
65707b1d
authored
Aug 07, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
93cbc696
828aa563
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
440 additions
and
196 deletions
+440
-196
EmployeeRegistrationPre.java
...plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
+5
-0
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+8
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+192
-128
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+12
-0
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+1
-1
InsuranceDaprUtil.java
...loud/plus/v1/yifu/common/dapr/util/InsuranceDaprUtil.java
+5
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+37
-3
TInsurancePreDetail.java
...d/plus/v1/yifu/insurances/entity/TInsurancePreDetail.java
+3
-3
EmployeePreInsuranceListVo.java
...lus/v1/yifu/insurances/vo/EmployeePreInsuranceListVo.java
+23
-0
InsuranceAddParam.java
...u/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java
+2
-1
InsuranceAutoParam.java
.../cloud/plus/v1/yifu/insurances/vo/InsuranceAutoParam.java
+2
-1
InsuranceBatchParam.java
...cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
+2
-1
InsuranceReplaceParam.java
...oud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
+2
-1
TEmployeeInsurancePreController.java
...nsurances/controller/TEmployeeInsurancePreController.java
+26
-4
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+2
-1
TInsuranceDetailMapper.java
.../insurances/mapper/insurances/TInsuranceDetailMapper.java
+2
-1
TEmployeeInsurancePreService.java
...ances/service/insurance/TEmployeeInsurancePreService.java
+11
-4
TInsuranceDetailService.java
...insurances/service/insurance/TInsuranceDetailService.java
+2
-1
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+92
-35
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+8
-8
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+3
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/EmployeeRegistrationPre.java
View file @
65707b1d
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
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
lombok.EqualsAndHashCode
;
...
...
@@ -129,6 +130,10 @@ public class EmployeeRegistrationPre extends BaseEntity {
@TableField
(
exist
=
false
)
private
TEmployeeContractPre
employeeContractPre
;
@Schema
(
description
=
"商险流程中信息集合"
)
@TableField
(
exist
=
false
)
private
List
<
TInsurancePreDetail
>
exitInsuranceInfoList
;
@Schema
(
description
=
"附件集合"
)
@TableField
(
exist
=
false
)
private
List
<
TAttaInfo
>
attaList
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
65707b1d
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.baomidou.mybatisplus.annotation.FieldStrategy
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -125,10 +126,17 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema
(
description
=
"商险待派单信息集合"
)
private
List
<
TEmployeeInsurancePreVo
>
employeeInsurancePreVos
;
@Schema
(
description
=
"商险流程中信息集合"
)
private
List
<
TInsurancePreDetail
>
exitInsuranceInfoList
;
@Schema
(
description
=
"合同待派单信息"
)
private
TEmployeeContractPreVo
employeeContractPreVos
;
@Schema
(
description
=
"附件集合"
)
private
List
<
TAttaInfoSaveVo
>
attaList
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"修改类型:1新增;2修改;3删除;4状态346为不可编辑"
)
private
String
modelType
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
65707b1d
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
65707b1d
...
...
@@ -225,6 +225,7 @@ 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
);
...
...
@@ -418,6 +419,7 @@ 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 +435,16 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
TEmployeePreLogDetail
detailInsuranceLog
;
for
(
TEmployeeInsurancePre
newInsurance
:
newList
)
{
differenceInsuranceKey
=
null
;
if
(
CommonConstants
.
THREE_STRING
.
equals
(
newInsurance
.
getModelType
()))
{
// 3:删除
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
detailInsuranceLog
.
setModelType
(
newInsurance
.
getModelType
());
detailInsuranceLog
.
setType
(
CommonConstants
.
TWO_STRING
);
this
.
setPreLogBaseInfo
(
empPreId
,
newInsurance
,
null
,
userId
,
nickName
,
differenceInsuranceKey
,
logId
,
detailInsuranceLog
);
isModifyInsurance
=
true
;
detailList
.
add
(
detailInsuranceLog
);
continue
;
}
// 2:修改有老ID
if
(
Common
.
isNotNull
(
newInsurance
.
getId
()))
{
oldInsurance
=
oldMap
.
get
(
newInsurance
.
getId
());
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
65707b1d
...
...
@@ -638,7 +638,7 @@ public interface CommonConstants {
List
<
String
>
processStatus
=
Stream
.
of
(
"0"
,
"1"
).
collect
(
Collectors
.
toList
());
List
<
String
>
processStatusEnd
=
Stream
.
of
(
"3"
,
"4
"
).
collect
(
Collectors
.
toList
());
List
<
String
>
insuranceAutoProcessStatus
=
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"5
"
).
collect
(
Collectors
.
toList
());
List
<
String
>
processPreStatus
=
Stream
.
of
(
"1"
).
collect
(
Collectors
.
toList
());
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/InsuranceDaprUtil.java
View file @
65707b1d
...
...
@@ -85,4 +85,9 @@ public class InsuranceDaprUtil {
,
daprInsurancesProperties
.
getAppId
(),
"/temployeeinsurancepre/inner/updateInsurancePreCustomerName"
,
updateVo
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
}
public
R
<
Boolean
>
checkExitInsuanceIsProcess
(
EmployeeRegistrationPreVo
preVo
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprInsurancesProperties
.
getAppUrl
(),
daprInsurancesProperties
.
getAppId
(),
"/temployeeinsurancepre/inner/checkExitInsuanceIsProcess"
,
JSON
.
toJSONString
(
preVo
),
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
65707b1d
...
...
@@ -569,7 +569,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
!
CommonConstants
.
ONE_STRING
.
equals
(
registration
.
getProcessStatus
())))
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
()
&&
Common
.
isNotNull
(
preVo
.
getInsuranceIsBuy
())
&&
preVo
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ONE_STRING
))
{
List
<
TEmployeeAutoRegistCheckVo
>
errorList
=
new
ArrayList
<>();
TEmployeeAutoRegistCheckVo
checkVo
;
String
key
;
...
...
@@ -619,6 +621,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
Common
.
isNotNull
(
preVo
.
getInsuranceIsBuy
())
&&
preVo
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
preVo
.
getExitInsuranceInfoList
().
isEmpty
())
{
//判断带出的流程中或者已完结的商险数据是否准确
//商险是否存在判断
boolean
isTrue
=
checkInsuranceIsProcess
(
preVo
);
if
(
isTrue
)
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
"带出的商险已购买数据状态或条数发生变更,请重新确认接收!"
);
}
}
//点击“接收确认”的时候,监测到该人员该项目下已有在项的档案时,再次提醒:该人员已在项,
//状态将更新成“已处理”;处理记录中,针对此情况,记录真实的进项时间,备注:先于登记入项
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
...
...
@@ -645,7 +658,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
initRegistPreInfo
(
registration
,
preVo
,
user
,
CommonConstants
.
ZERO_STRING
);
R
<
String
>
domainR
=
archivesDaprUtil
.
saveRegistPreInfo
(
preVo
);
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
()))
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//是否存在商险为是时生成入职确认信息商险明细数据
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
Common
.
isNotNull
(
preVo
.
getInsuranceIsBuy
())
&&
preVo
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
preVo
.
getExitInsuranceInfoList
().
isEmpty
())
{
preVo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
domainR
.
getData
()));
//生成入职确认信息商险明细数据
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
else
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
for
(
TEmployeeInsurancePreVo
insurancePreVo
:
preVo
.
getEmployeeInsurancePreVos
())
{
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
...
...
@@ -1097,7 +1117,14 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
initRegistPreInfo
(
registrationNow
,
preVo
,
user
,
CommonConstants
.
FOUR_STRING
);
R
<
String
>
domainR
=
archivesDaprUtil
.
saveRegistPreInfo
(
preVo
);
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
())){
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//是否存在商险为是时生成入职确认信息商险明细数据
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
Common
.
isNotNull
(
preVo
.
getInsuranceIsBuy
())
&&
preVo
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
preVo
.
getExitInsuranceInfoList
().
isEmpty
())
{
preVo
.
getExitInsuranceInfoList
().
forEach
(
insurancePreVo
->
insurancePreVo
.
setRegisterId
(
domainR
.
getData
()));
//生成入职确认信息商险明细数据
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
else
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
for
(
TEmployeeInsurancePreVo
insurancePreVo
:
preVo
.
getEmployeeInsurancePreVos
())
{
initInsruancePreInfo
(
registrationNow
,
insurancePreVo
,
user
,
domainR
.
getData
());
...
...
@@ -1602,6 +1629,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 15:20"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
//商险状态是否正常判断
private
boolean
checkInsuranceIsProcess
(
EmployeeRegistrationPreVo
preVo
)
{
R
<
Boolean
>
flag
=
insuranceDaprUtil
.
checkExitInsuanceIsProcess
(
preVo
);
//是否已签署为是需要判断合同是否在用或者流程中
return
Common
.
isEmpty
(
flag
)
||
Boolean
.
TRUE
.
equals
(!
flag
.
getData
());
}
//商险是否存在判断
private
TEmployeeAutoRegistCheckVo
checkInsuranceExit
(
TEmployeeInsurancePreVo
preVo
,
EmployeeRegistration
registration
)
{
//查询入职确认信息数据
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsurancePreDetail.java
View file @
65707b1d
...
...
@@ -112,11 +112,11 @@ public class TInsurancePreDetail extends BaseEntity {
@Schema
(
description
=
"保单生效日期"
)
private
Date
policyEffect
;
/**
*
购买
类型, 1新增、3批增、4替换
*
投保
类型, 1新增、3批增、4替换
*/
@ExcelAttribute
(
name
=
"购买类型, 1新增、3批增、4替换"
)
@ExcelProperty
(
"
购买
类型, 1新增、3批增、4替换"
)
@Schema
(
description
=
"
购买
类型, 1新增、3批增、4替换"
)
@ExcelProperty
(
"
投保
类型, 1新增、3批增、4替换"
)
@Schema
(
description
=
"
投保
类型, 1新增、3批增、4替换"
)
private
Integer
buyType
;
/**
* 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EmployeePreInsuranceListVo.java
0 → 100644
View file @
65707b1d
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
;
/**
* @author huych
* @description 商险自动化已购买商险明细VO
* @date 2025-8-7 10:20:26
*/
@Data
@Schema
(
description
=
"商险自动化已购买商险明细VO"
)
public
class
EmployeePreInsuranceListVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
628032758008497542L
;
private
List
<
TInsurancePreDetail
>
preList
=
new
ArrayList
<>();
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAddParam.java
View file @
65707b1d
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -222,5 +223,5 @@ public class InsuranceAddParam implements Serializable {
@Schema
(
description
=
"是否已有参保明细标识"
)
private
String
isExit
;
private
List
<
InsuredListVo
>
inProgressList
;
private
List
<
TInsurancePreDetail
>
inProgressList
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceAutoParam.java
View file @
65707b1d
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -164,5 +165,5 @@ public class InsuranceAutoParam implements Serializable {
@Schema
(
description
=
"是否已有参保明细标识"
)
private
String
isExit
;
private
List
<
InsuredListVo
>
inProgressList
;
private
List
<
TInsurancePreDetail
>
inProgressList
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceBatchParam.java
View file @
65707b1d
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -229,5 +230,5 @@ public class InsuranceBatchParam implements Serializable {
@Schema
(
description
=
"是否已有参保明细标识"
)
private
String
isExit
;
private
List
<
InsuredListVo
>
inProgressList
;
private
List
<
TInsurancePreDetail
>
inProgressList
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceReplaceParam.java
View file @
65707b1d
...
...
@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.vo;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
...
...
@@ -164,6 +165,6 @@ public class InsuranceReplaceParam implements Serializable {
@Schema
(
description
=
"是否已有参保明细标识"
)
private
String
isExit
;
private
List
<
InsuredListVo
>
inProgressList
;
private
List
<
TInsurancePreDetail
>
inProgressList
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TEmployeeInsurancePreController.java
View file @
65707b1d
...
...
@@ -12,10 +12,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TEmployeeInsurancePreService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EmployeePreLogListVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -190,6 +187,18 @@ public class TEmployeeInsurancePreController {
return
tEmployeeInsurancePreService
.
saveInsurancePreInfo
(
preVo
);
}
/**
* 商险状态是否正常判断
* @author huych
* @date 2025-08-05 16:26:38
**/
@Operation
(
description
=
"商险状态是否正常判断"
)
@Inner
@PostMapping
(
"/inner/checkExitInsuanceIsProcess"
)
public
Boolean
checkExitInsuanceIsProcess
(
@RequestBody
EmployeeRegistrationPreVo
preVo
)
{
return
tEmployeeInsurancePreService
.
checkExitInsuanceIsProcess
(
preVo
);
}
/**
* 更新商险待购买的前端客服姓名
* @author huych
...
...
@@ -265,4 +274,17 @@ public class TEmployeeInsurancePreController {
return
tEmployeeInsurancePreService
.
deleteInsuranceByPreId
(
preId
);
}
/**
* @param empPreId 入职确认信息表ID
* @Description: 获取商险已购买信息
* @Author: huych
* @Date: 2025/8/7 10:25
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail>>
**/
@Inner
@PostMapping
(
"/inner/getExitInsuranceListByEmpPreId"
)
public
EmployeePreInsuranceListVo
getExitInsuranceListByEmpPreId
(
@RequestBody
String
empPreId
){
return
tEmployeeInsurancePreService
.
getExitInsuranceListByEmpPreId
(
empPreId
);
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
65707b1d
...
...
@@ -14,6 +14,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
...
...
@@ -881,7 +882,7 @@ public class TInsuranceDetailController {
*/
@Operation
(
description
=
"查询在用或者在途的商险数据"
)
@GetMapping
(
"/getOnProcessInsurancesInfo"
)
public
R
<
List
<
InsuredListVo
>>
getInProcessInsurancesInfo
(
@RequestParam
String
empIdcard
)
{
public
R
<
List
<
TInsurancePreDetail
>>
getInProcessInsurancesInfo
(
@RequestParam
String
empIdcard
)
{
return
R
.
ok
(
tInsuranceDetailService
.
getOnProcessInsurancesInfo
(
empIdcard
));
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java
View file @
65707b1d
...
...
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -337,6 +338,6 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
/**
* 派单前系统已有在途/在保数据的人员明细
*/
List
<
InsuredListVo
>
getOnProcessInsuredList
(
@Param
(
"empIdCard"
)
String
empIdCard
);
List
<
TInsurancePreDetail
>
getOnProcessInsuredList
(
@Param
(
"empIdCard"
)
String
empIdCard
);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TEmployeeInsurancePreService.java
View file @
65707b1d
...
...
@@ -7,10 +7,7 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo;
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
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EmployeePreLogListVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
...
...
@@ -71,6 +68,8 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
*/
Boolean
saveInsurancePreInfo
(
EmployeeRegistrationPreVo
preVo
);
Boolean
checkExitInsuanceIsProcess
(
EmployeeRegistrationPreVo
preVo
);
TEmployeeInsuranceSelectVo
selectInsurancePreInfoList
(
TEmployeeInsurancePreVo
preVo
);
void
updateInsurancePreCustomerName
(
EmployeeRegistrationCustomerUserUpdateVo
updateVo
);
...
...
@@ -102,4 +101,12 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
**/
boolean
deleteInsuranceByPreId
(
String
preId
);
/**
* @param empPreId 入职确认信息表ID
* @Description: 获取商险已购买信息
* @Author: huych
* @Date: 2025/8/7 10:25
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail>>
**/
EmployeePreInsuranceListVo
getExitInsuranceListByEmpPreId
(
String
empPreId
);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java
View file @
65707b1d
...
...
@@ -9,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskListVo
;
...
...
@@ -575,7 +576,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
*/
IPage
<
InsuredListVo
>
policyPageToAutoSelect
(
Page
<
InsuredListVo
>
page
,
InsuredParam
param
,
String
mId
);
List
<
InsuredListVo
>
getOnProcessInsurancesInfo
(
String
empIdCard
);
List
<
TInsurancePreDetail
>
getOnProcessInsurancesInfo
(
String
empIdCard
);
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
65707b1d
...
...
@@ -25,10 +25,12 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.config.WxConfig
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsurancePreDetail
;
import
com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TEmployeeInsurancePreMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.ScheduleService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TEmployeeInsurancePreService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsurancePreDetailService
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.*
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -64,10 +66,10 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
@Autowired
@Lazy
private
TInsuranceDetailService
detailService
;
@Autowired
@Lazy
private
ScheduleService
scheduleService
;
//
//
@Autowired
//
@Lazy
//
private ScheduleService scheduleService;
@Autowired
private
WxConfig
wxConfig
;
...
...
@@ -75,6 +77,9 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
@Autowired
private
UpmsDaprUtils
upmsDaprUtils
;
@Autowired
private
TInsurancePreDetailService
preDetailService
;
/**
* 商险待办任务表简单分页查询
*
...
...
@@ -327,6 +332,21 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
@Override
@Transactional
public
Boolean
saveInsurancePreInfo
(
EmployeeRegistrationPreVo
registrationPreVo
)
{
if
(
Common
.
isNotNull
(
registrationPreVo
.
getInsuranceIsBuy
())
&&
registrationPreVo
.
getInsuranceIsBuy
().
equals
(
CommonConstants
.
ZERO_STRING
)
&&
!
registrationPreVo
.
getExitInsuranceInfoList
().
isEmpty
())
{
//删除已存在的入职确认信息对应的商险明细
preDetailService
.
remove
(
Wrappers
.<
TInsurancePreDetail
>
lambdaQuery
()
.
eq
(
TInsurancePreDetail:
:
getRegisterId
,
registrationPreVo
.
getExitInsuranceInfoList
()
.
get
(
0
).
getRegisterId
()));
//批量新增
preDetailService
.
saveBatch
(
registrationPreVo
.
getExitInsuranceInfoList
());
//批量删除商险待购买列表中的待确认、待派单、派单失败、投保退回的数据
baseMapper
.
delete
(
Wrappers
.<
TEmployeeInsurancePre
>
query
().
lambda
().
in
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
insuranceAutoProcessStatus
)
.
eq
(
TEmployeeInsurancePre:
:
getRegisterId
,
registrationPreVo
.
getExitInsuranceInfoList
()
.
get
(
0
).
getRegisterId
()));
}
else
{
List
<
TEmployeeInsurancePreVo
>
employeeInsurancePreVos
=
registrationPreVo
.
getEmployeeInsurancePreVos
();
TEmployeeInsurancePre
preExit
;
if
(
null
!=
employeeInsurancePreVos
&&
!
employeeInsurancePreVos
.
isEmpty
())
{
...
...
@@ -370,14 +390,42 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
// }
}
}
}
catch
(
Exception
e
)
{
log
.
error
(
"执行异常"
,
e
);
}
catch
(
Exception
e
)
{
log
.
error
(
"执行异常"
,
e
);
return
null
;
}
}
}
return
true
;
}
@Override
public
Boolean
checkExitInsuanceIsProcess
(
EmployeeRegistrationPreVo
preVo
)
{
//如果状态有变动就会拦截
if
(
Common
.
isNotNull
(
preVo
)
&&
Common
.
isNotNull
(
preVo
.
getExitInsuranceInfoList
())
&&
!
preVo
.
getExitInsuranceInfoList
().
isEmpty
())
{
for
(
TInsurancePreDetail
preDetail:
preVo
.
getExitInsuranceInfoList
())
{
TInsuranceDetail
insuranceDetail
=
detailService
.
getById
(
preDetail
.
getId
());
if
(
Common
.
isEmpty
(
insuranceDetail
)
||
!
insuranceDetail
.
getBuyHandleStatus
().
equals
(
preDetail
.
getBuyHandleStatus
()))
{
return
false
;
}
}
//如果有数据新增也要拦截
long
count
=
detailService
.
count
(
Wrappers
.<
TInsuranceDetail
>
query
().
lambda
()
.
eq
(
TInsuranceDetail:
:
getEmpIdcardNo
,
preVo
.
getEmpIdcard
())
.
eq
(
TInsuranceDetail:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
//流程中或者已完结
.
and
(
wrapper
->
wrapper
.
eq
(
TInsuranceDetail:
:
getIsEffect
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail:
:
getIsOverdue
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TInsuranceDetail:
:
getBuyHandleStatus
,
CommonConstants
.
THREE_INT
)
.
or
().
eq
(
TInsuranceDetail:
:
getBuyHandleStatus
,
CommonConstants
.
TWO_INT
)
.
or
().
eq
(
TInsuranceDetail:
:
getBuyHandleStatus
,
CommonConstants
.
ONE_INT
)));
return
count
==
preVo
.
getExitInsuranceInfoList
().
size
();
}
return
false
;
}
@Override
public
TEmployeeInsuranceSelectVo
selectInsurancePreInfoList
(
TEmployeeInsurancePreVo
preVo
)
{
TEmployeeInsuranceSelectVo
selectVo
=
new
TEmployeeInsuranceSelectVo
();
...
...
@@ -627,4 +675,13 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return
true
;
}
@Override
public
EmployeePreInsuranceListVo
getExitInsuranceListByEmpPreId
(
String
empPreId
)
{
EmployeePreInsuranceListVo
vo
=
new
EmployeePreInsuranceListVo
();
List
<
TInsurancePreDetail
>
preList
=
preDetailService
.
list
(
Wrappers
.<
TInsurancePreDetail
>
query
().
lambda
()
.
eq
(
TInsurancePreDetail:
:
getRegisterId
,
empPreId
));
vo
.
setPreList
(
preList
);
return
vo
;
}
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
65707b1d
...
...
@@ -3071,7 +3071,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//本次派单人员系统已有参保明细 如果是二次派单则无需校验
if
(
Common
.
isEmpty
(
param
.
getIsExit
()))
{
List
<
InsuredListVo
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
getEmpIdcardNo
());
List
<
TInsurancePreDetail
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
getEmpIdcardNo
());
if
(
Common
.
isNotNull
(
listInsured
)
&&
!
listInsured
.
isEmpty
())
{
param
.
setIsExit
(
CommonConstants
.
ONE_STRING
);
param
.
setErrorMessage
(
InsurancesConstants
.
DIS_PERSON_DATA_IS_EXIST
);
...
...
@@ -3478,7 +3478,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//本次派单人员系统已有参保明细 如果是二次派单则无需校验
if
(
Common
.
isEmpty
(
param
.
getIsExit
()))
{
List
<
InsuredListVo
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
getEmpIdcardNo
());
List
<
TInsurancePreDetail
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
getEmpIdcardNo
());
if
(
Common
.
isNotNull
(
listInsured
)
&&
!
listInsured
.
isEmpty
())
{
param
.
setIsExit
(
CommonConstants
.
ONE_STRING
);
param
.
setErrorMessage
(
InsurancesConstants
.
DIS_PERSON_DATA_IS_EXIST
);
...
...
@@ -3877,7 +3877,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
//本次派单人员系统已有参保明细 如果是二次派单则无需校验
if
(
Common
.
isEmpty
(
param
.
getIsExit
()))
{
List
<
InsuredListVo
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
getEmpIdcardNo
());
List
<
TInsurancePreDetail
>
listInsured
=
baseMapper
.
getOnProcessInsuredList
(
param
.
getEmpIdcardNo
());
if
(
Common
.
isNotNull
(
listInsured
)
&&
!
listInsured
.
isEmpty
())
{
param
.
setIsExit
(
CommonConstants
.
ONE_STRING
);
param
.
setErrorMessage
(
InsurancesConstants
.
DIS_PERSON_DATA_IS_EXIST
);
...
...
@@ -8468,10 +8468,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.
and
(
wrapper
->
wrapper
.
eq
(
TInsuranceDetail:
:
getIsOverdue
,
CommonConstants
.
ZERO_INT
)
.
or
().
isNull
(
TInsuranceDetail:
:
getIsOverdue
)
)
//在用
.
and
(
wrapper
->
wrapper
.
eq
(
TInsuranceDetail:
:
getIsUse
,
CommonConstants
.
ZERO_INT
)
.
or
().
isNull
(
TInsuranceDetail:
:
getIsUse
)
)
//
//在用
//
.and(wrapper -> wrapper.eq(TInsuranceDetail::getIsUse, CommonConstants.ZERO_INT)
//
.or().isNull(TInsuranceDetail::getIsUse)
//
)
.
orderByDesc
(
TInsuranceDetail:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
);
...
...
@@ -8534,7 +8534,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
@Override
public
List
<
InsuredListVo
>
getOnProcessInsurancesInfo
(
String
empIdCard
)
{
public
List
<
TInsurancePreDetail
>
getOnProcessInsurancesInfo
(
String
empIdCard
)
{
return
baseMapper
.
getOnProcessInsuredList
(
empIdCard
);
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
65707b1d
...
...
@@ -594,14 +594,14 @@
</update>
<!-- 派单人员系统已有参保明细查询-->
<select
id=
"getOnProcessInsuredList"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.
vo.InsuredListVo
"
>
<select
id=
"getOnProcessInsuredList"
resultType=
"com.yifu.cloud.plus.v1.yifu.insurances.
entity.TInsurancePreDetail
"
>
select
a.id as id,
a.EMP_NAME as empName,
a.EMP_IDCARD_NO as empIdcardNo,
a.BUY_TYPE as buyType,
a.DEPT_NO as deptNo,
a.DEPT_NAME as
projec
tName,
a.DEPT_NAME as
dep
tName,
a.POST as post,
a.POLICY_START as policyStart,
a.POLICY_END as policyEnd,
...
...
@@ -619,7 +619,7 @@
t_insurance_detail a
where
a.DELETE_FLAG = 0
and (a.BUY_HANDLE_STATUS
= 2
or (a.BUY_HANDLE_STATUS = 3 and a.isEffect = 0 and a.isOverdue = 0))
and (a.BUY_HANDLE_STATUS
in (1,2)
or (a.BUY_HANDLE_STATUS = 3 and a.isEffect = 0 and a.isOverdue = 0))
AND EMP_IDCARD_NO = #{empIdCard}
</select>
...
...
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