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
bc2d7eca
Commit
bc2d7eca
authored
Apr 07, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
23c9ecda
68efb7f8
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
12 deletions
+52
-12
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+7
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+9
-0
TEmployeeInsurancePre.java
...plus/v1/yifu/insurances/entity/TEmployeeInsurancePre.java
+4
-4
TInsurancePreRenewDetail.java
...s/v1/yifu/insurances/entity/TInsurancePreRenewDetail.java
+3
-3
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+6
-0
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+18
-3
DoJointInsuranceTask.java
...ud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
+5
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
bc2d7eca
...
@@ -694,7 +694,13 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -694,7 +694,13 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
&&
!
preVo
.
getContractEnd
().
equals
(
preVo
.
getDispatchPeriodEnd
())){
&&
!
preVo
.
getContractEnd
().
equals
(
preVo
.
getDispatchPeriodEnd
())){
errorMessages
.
add
(
"合同截止日期与派遣截止日期不一致"
);
errorMessages
.
add
(
"合同截止日期与派遣截止日期不一致"
);
}
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if
(
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getContractTerm
())){
if
(!
preVo
.
getContractDurationYear
().
equals
(
preVo
.
getDispatchPeriodYear
())
||
!
preVo
.
getContractDurationMonth
().
equals
(
preVo
.
getDispatchPeriodMonth
())){
errorMessages
.
add
(
"劳务派遣合同需要和标准合同一致"
);
}
}
// 如果有错误信息,一起返回
// 如果有错误信息,一起返回
if
(!
errorMessages
.
isEmpty
())
{
if
(!
errorMessages
.
isEmpty
())
{
return
String
.
join
(
";"
,
errorMessages
);
return
String
.
join
(
";"
,
errorMessages
);
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
bc2d7eca
...
@@ -1275,6 +1275,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1275,6 +1275,15 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
}
}
}
}
//固定期限时 劳务派遣合同需要校验 标准合同的年限和劳务派遣合同的年限一致
if
(
"劳务派遣合同"
.
equals
(
employeeContractPreVo
.
getContractType
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractTerm
())){
if
(!
employeeContractPreVo
.
getContractDurationYear
().
equals
(
employeeContractPreVo
.
getDispatchPeriodYear
())
||
!
employeeContractPreVo
.
getContractDurationMonth
().
equals
(
employeeContractPreVo
.
getDispatchPeriodMonth
())){
allErrorMessages
.
add
(
"劳务派遣合同需要和标准合同一致"
);
}
}
}
// 校验合同有效期:合同截止日期不得早于合同开始日期
// 校验合同有效期:合同截止日期不得早于合同开始日期
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TEmployeeInsurancePre.java
View file @
bc2d7eca
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.*
;
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.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
jdk.nashorn.internal.ir.annotations.Ignore
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
...
@@ -148,9 +146,11 @@ public class TEmployeeInsurancePre extends BaseEntity {
...
@@ -148,9 +146,11 @@ public class TEmployeeInsurancePre extends BaseEntity {
@Schema
(
description
=
"商险ID"
)
@Schema
(
description
=
"商险ID"
)
private
String
insurancesId
;
private
String
insurancesId
;
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@Schema
(
description
=
"发起失败原因"
)
@Schema
(
description
=
"发起失败原因"
)
private
String
errorInfo
;
private
String
errorInfo
;
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@Schema
(
description
=
"发起失败时间"
)
@Schema
(
description
=
"发起失败时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonIgnore
@JsonIgnore
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsurancePreRenewDetail.java
View file @
bc2d7eca
...
@@ -18,9 +18,7 @@
...
@@ -18,9 +18,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -312,6 +310,7 @@ public class TInsurancePreRenewDetail extends BaseEntity {
...
@@ -312,6 +310,7 @@ public class TInsurancePreRenewDetail extends BaseEntity {
/**
/**
* 失败原因
* 失败原因
*/
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"失败原因"
,
maxLength
=
200
)
@ExcelAttribute
(
name
=
"失败原因"
,
maxLength
=
200
)
@Length
(
max
=
200
,
message
=
"失败原因不能超过200个字符"
)
@Length
(
max
=
200
,
message
=
"失败原因不能超过200个字符"
)
@ExcelProperty
(
"失败原因"
)
@ExcelProperty
(
"失败原因"
)
...
@@ -320,6 +319,7 @@ public class TInsurancePreRenewDetail extends BaseEntity {
...
@@ -320,6 +319,7 @@ public class TInsurancePreRenewDetail extends BaseEntity {
/**
/**
* 失败时间
* 失败时间
*/
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"失败时间"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"失败时间"
,
isDate
=
true
)
@ExcelProperty
(
"失败时间"
)
@ExcelProperty
(
"失败时间"
)
@Schema
(
description
=
"失败时间"
)
@Schema
(
description
=
"失败时间"
)
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
bc2d7eca
...
@@ -1044,8 +1044,14 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
...
@@ -1044,8 +1044,14 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
}
}
}
}
// 已完成状态不需要更新
if
(
CommonConstants
.
SIX_STRING
.
equals
(
insurancePre
.
getProcessStatus
()))
{
return
true
;
}
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeInsurancePre:
:
getRegisterId
,
preVo
.
getRegisterId
());
updateWrapper
.
eq
(
TEmployeeInsurancePre:
:
getRegisterId
,
preVo
.
getRegisterId
());
updateWrapper
.
ne
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
SIX_STRING
);
updateWrapper
.
set
(
TEmployeeInsurancePre:
:
getIsRefuse
,
CommonConstants
.
ZERO_STRING
);
updateWrapper
.
set
(
TEmployeeInsurancePre:
:
getIsRefuse
,
CommonConstants
.
ZERO_STRING
);
return
this
.
update
(
updateWrapper
);
return
this
.
update
(
updateWrapper
);
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
bc2d7eca
...
@@ -10048,6 +10048,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -10048,6 +10048,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
if
(
Common
.
isNotNull
(
pre
))
{
if
(
Common
.
isNotNull
(
pre
))
{
pre
.
setProcessStatus
(
status
);
pre
.
setProcessStatus
(
status
);
if
(
CommonConstants
.
THREE_STRING
.
equals
(
status
)
||
CommonConstants
.
SEVEN_STRING
.
equals
(
status
)){
pre
.
setErrorInfo
(
null
);
pre
.
setErrorTime
(
null
);
}
if
(
Common
.
isNotNull
(
insuranceDetail
.
getId
()))
{
if
(
Common
.
isNotNull
(
insuranceDetail
.
getId
()))
{
pre
.
setInsurancesId
(
insuranceDetail
.
getId
());
pre
.
setInsurancesId
(
insuranceDetail
.
getId
());
pre
.
setIsAddress
(
insuranceDetail
.
getIsAdress
());
pre
.
setIsAddress
(
insuranceDetail
.
getIsAdress
());
...
@@ -10097,6 +10101,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -10097,6 +10101,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
if
(
Common
.
isNotNull
(
pre
))
{
if
(
Common
.
isNotNull
(
pre
))
{
pre
.
setProcessStatus
(
status
);
pre
.
setProcessStatus
(
status
);
if
(
CommonConstants
.
THREE_STRING
.
equals
(
status
)
||
CommonConstants
.
SEVEN_STRING
.
equals
(
status
)){
pre
.
setErrorInfo
(
null
);
pre
.
setErrorTime
(
null
);
}
if
(
Common
.
isNotNull
(
insuranceDetail
.
getId
()))
{
if
(
Common
.
isNotNull
(
insuranceDetail
.
getId
()))
{
pre
.
setInsurancesIdNew
(
insuranceDetail
.
getId
());
pre
.
setInsurancesIdNew
(
insuranceDetail
.
getId
());
pre
.
setIsAddress
(
insuranceDetail
.
getIsAdress
());
pre
.
setIsAddress
(
insuranceDetail
.
getIsAdress
());
...
@@ -10423,7 +10431,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -10423,7 +10431,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//通过ids 更新自动化测状态processStatus为待投保
//通过ids 更新自动化测状态processStatus为待投保
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateDiyInfoWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateDiyInfoWrapper
=
new
LambdaUpdateWrapper
<>();
updateDiyInfoWrapper
.
in
(
TEmployeeInsurancePre:
:
getInsurancesId
,
ids
)
updateDiyInfoWrapper
.
in
(
TEmployeeInsurancePre:
:
getInsurancesId
,
ids
)
.
set
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
THREE_STRING
);
.
set
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
THREE_STRING
)
.
set
(
TEmployeeInsurancePre:
:
getErrorInfo
,
null
)
.
set
(
TEmployeeInsurancePre:
:
getErrorTime
,
null
);
employeeInsurancePreMapper
.
update
(
null
,
updateDiyInfoWrapper
);
employeeInsurancePreMapper
.
update
(
null
,
updateDiyInfoWrapper
);
}
}
}
}
...
@@ -10478,12 +10489,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
...
@@ -10478,12 +10489,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//通过ids 更新自动化测状态processStatus为待投保
//通过ids 更新自动化测状态processStatus为待投保
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateDiyInfoWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateDiyInfoWrapper
=
new
LambdaUpdateWrapper
<>();
updateDiyInfoWrapper
.
in
(
TEmployeeInsurancePre:
:
getInsurancesId
,
insuranceIds
)
updateDiyInfoWrapper
.
in
(
TEmployeeInsurancePre:
:
getInsurancesId
,
insuranceIds
)
.
set
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
SEVEN_STRING
);
.
set
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
SEVEN_STRING
)
.
set
(
TEmployeeInsurancePre:
:
getErrorTime
,
null
)
.
set
(
TEmployeeInsurancePre:
:
getErrorInfo
,
null
);;
employeeInsurancePreMapper
.
update
(
null
,
updateDiyInfoWrapper
);
employeeInsurancePreMapper
.
update
(
null
,
updateDiyInfoWrapper
);
LambdaUpdateWrapper
<
TInsurancePreRenewDetail
>
updateReNewInfoWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TInsurancePreRenewDetail
>
updateReNewInfoWrapper
=
new
LambdaUpdateWrapper
<>();
updateReNewInfoWrapper
.
in
(
TInsurancePreRenewDetail:
:
getInsurancesId
,
insuranceIds
)
updateReNewInfoWrapper
.
in
(
TInsurancePreRenewDetail:
:
getInsurancesId
,
insuranceIds
)
.
set
(
TInsurancePreRenewDetail:
:
getProcessStatus
,
CommonConstants
.
SEVEN_STRING
);
.
set
(
TInsurancePreRenewDetail:
:
getProcessStatus
,
CommonConstants
.
SEVEN_STRING
)
.
set
(
TInsurancePreRenewDetail:
:
getErrorTime
,
null
)
.
set
(
TInsurancePreRenewDetail:
:
getErrorInfo
,
null
);
tInsurancePreRenewDetailMapper
.
update
(
null
,
updateReNewInfoWrapper
);
tInsurancePreRenewDetailMapper
.
update
(
null
,
updateReNewInfoWrapper
);
}
}
}
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/DoJointInsuranceTask.java
View file @
bc2d7eca
...
@@ -279,11 +279,15 @@ public class DoJointInsuranceTask {
...
@@ -279,11 +279,15 @@ public class DoJointInsuranceTask {
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeInsurancePre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeInsurancePre:
:
getInsurancesId
,
detail
.
getId
());
updateWrapper
.
eq
(
TEmployeeInsurancePre:
:
getInsurancesId
,
detail
.
getId
());
updateWrapper
.
set
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
THREE_STRING
);
updateWrapper
.
set
(
TEmployeeInsurancePre:
:
getProcessStatus
,
CommonConstants
.
THREE_STRING
);
updateWrapper
.
set
(
TEmployeeInsurancePre:
:
getErrorTime
,
null
);
updateWrapper
.
set
(
TEmployeeInsurancePre:
:
getErrorInfo
,
null
);
tEmployeeInsurancePreMapper
.
update
(
null
,
updateWrapper
);
tEmployeeInsurancePreMapper
.
update
(
null
,
updateWrapper
);
LambdaUpdateWrapper
<
TInsurancePreRenewDetail
>
updateReNewInfoWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TInsurancePreRenewDetail
>
updateReNewInfoWrapper
=
new
LambdaUpdateWrapper
<>();
updateReNewInfoWrapper
.
eq
(
TInsurancePreRenewDetail:
:
getInsurancesId
,
detail
.
getId
())
updateReNewInfoWrapper
.
eq
(
TInsurancePreRenewDetail:
:
getInsurancesId
,
detail
.
getId
())
.
set
(
TInsurancePreRenewDetail:
:
getProcessStatus
,
CommonConstants
.
SEVEN_STRING
);
.
set
(
TInsurancePreRenewDetail:
:
getProcessStatus
,
CommonConstants
.
SEVEN_STRING
)
.
set
(
TInsurancePreRenewDetail:
:
getErrorTime
,
null
)
.
set
(
TInsurancePreRenewDetail:
:
getErrorInfo
,
null
);
tInsurancePreRenewDetailMapper
.
update
(
null
,
updateReNewInfoWrapper
);
tInsurancePreRenewDetailMapper
.
update
(
null
,
updateReNewInfoWrapper
);
}
}
}
}
...
...
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