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
f9a9e04d
Commit
f9a9e04d
authored
Apr 08, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
7b2e1d3c
e30065ef
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
82 additions
and
32 deletions
+82
-32
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+1
-0
TEmpContractAlertExportVo.java
...d/plus/v1/yifu/archives/vo/TEmpContractAlertExportVo.java
+3
-3
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+6
-2
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+27
-5
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+8
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+13
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+9
-9
TEmployeeInsurancePreExportVo.java
.../v1/yifu/insurances/vo/TEmployeeInsurancePreExportVo.java
+3
-3
TInsuranceAlertExportVO.java
...d/plus/v1/yifu/insurances/vo/TInsuranceAlertExportVO.java
+1
-1
TDispatchInfoPreExportVo.java
...loud/plus/v1/yifu/social/vo/TDispatchInfoPreExportVo.java
+3
-3
TDispatchInfoPreFundExportVo.java
.../plus/v1/yifu/social/vo/TDispatchInfoPreFundExportVo.java
+3
-3
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+5
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
f9a9e04d
...
@@ -83,6 +83,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -83,6 +83,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"撤销签署原因"
)
@Schema
(
description
=
"撤销签署原因"
)
private
String
revokeReason
;
private
String
revokeReason
;
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@Schema
(
description
=
"发起失败原因"
)
@Schema
(
description
=
"发起失败原因"
)
private
String
errorInfo
;
private
String
errorInfo
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmpContractAlertExportVo.java
View file @
f9a9e04d
...
@@ -319,10 +319,10 @@ public class TEmpContractAlertExportVo {
...
@@ -319,10 +319,10 @@ public class TEmpContractAlertExportVo {
/**
/**
* 异常原因说明
* 异常原因说明
*/
*/
@ExcelAttribute
(
name
=
"
异常原因说明
"
,
maxLength
=
200
)
@ExcelAttribute
(
name
=
"
发起失败原因
"
,
maxLength
=
200
)
@Length
(
max
=
200
,
message
=
"异常原因说明不能超过200个字符"
)
@Length
(
max
=
200
,
message
=
"异常原因说明不能超过200个字符"
)
@ExcelProperty
(
"
异常原因说明
"
)
@ExcelProperty
(
"
发起失败原因
"
)
@Schema
(
description
=
"
异常原因说明
"
)
@Schema
(
description
=
"
发起失败原因
"
)
private
String
errorInfo
;
private
String
errorInfo
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
f9a9e04d
...
@@ -592,11 +592,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -592,11 +592,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreNew
.
setProcessStatus
(
"1"
.
equals
(
contractPreNew
.
getSignType
())
?
contractPreNew
.
setProcessStatus
(
"1"
.
equals
(
contractPreNew
.
getSignType
())
?
CommonConstants
.
TWO_STRING
:
CommonConstants
.
SIX_STRING
);
CommonConstants
.
TWO_STRING
:
CommonConstants
.
SIX_STRING
);
contractPreNew
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPreNew
.
setContractId
(
tEmployeeContractInfo
.
getId
());
contractPreNew
.
setErrorInfo
(
""
);
contractPreNew
.
setErrorTime
(
null
);
contractPreNew
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
contractPreNew
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
contractPreNew
.
setRevokeReason
(
""
);
contractPreNew
.
setRevokeReason
(
""
);
contractPreNew
.
setErrorInfo
(
null
);
contractPreNew
.
setErrorTime
(
null
);
contractPreNewMapper
.
updateById
(
contractPreNew
);
contractPreNewMapper
.
updateById
(
contractPreNew
);
//更新续签待办提醒的办理状态为处理中
//更新续签待办提醒的办理状态为处理中
LambdaUpdateWrapper
<
TEmpContractAlert
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmpContractAlert
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
...
@@ -623,6 +623,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -623,6 +623,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
}
else
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
ONE_INT
)
{
}
else
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
ONE_INT
)
{
contractPre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
contractPre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
contractPre
.
setErrorInfo
(
null
);
contractPre
.
setErrorTime
(
null
);
}
}
contractPre
.
setRevokeReason
(
""
);
contractPre
.
setRevokeReason
(
""
);
contractPre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
contractPre
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
...
@@ -638,6 +640,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -638,6 +640,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreNew
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPreNew
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
}
else
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
ONE_INT
)
{
}
else
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
ONE_INT
)
{
contractPreNew
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
contractPreNew
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
contractPreNew
.
setErrorInfo
(
null
);
contractPreNew
.
setErrorTime
(
null
);
}
}
contractPreNew
.
setRevokeReason
(
""
);
contractPreNew
.
setRevokeReason
(
""
);
contractPreNew
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
contractPreNew
.
setSignFlag
(
CommonConstants
.
ONE_STRING
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
f9a9e04d
...
@@ -698,18 +698,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -698,18 +698,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
if
(
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getContractTerm
())){
if
(
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getContractTerm
())){
if
(!
preVo
.
getContractDurationYear
().
equals
(
preVo
.
getDispatchPeriodYear
())
if
(!
preVo
.
getContractDurationYear
().
equals
(
preVo
.
getDispatchPeriodYear
())
||
!
preVo
.
getContractDurationMonth
().
equals
(
preVo
.
getDispatchPeriodMonth
())){
||
!
preVo
.
getContractDurationMonth
().
equals
(
preVo
.
getDispatchPeriodMonth
())){
errorMessages
.
add
(
"劳务派遣合同
需要和标准合同
一致"
);
errorMessages
.
add
(
"劳务派遣合同
年限需要和标准合同年限
一致"
);
}
}
}
}
// 如果有错误信息,一起返回
// 如果有错误信息,一起返回
if
(!
errorMessages
.
isEmpty
())
{
if
(!
errorMessages
.
isEmpty
())
{
return
String
.
join
(
";"
,
errorMessages
)
;
return
"合同的年限、开始日期、截止日期同派遣的期限、开始日期、截止日期不一致,请调整!"
;
}
}
}
}
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getContractEnd
())){
if
(
Common
.
isNotNull
(
preVo
.
getContractStart
())
&&
Common
.
isNotNull
(
preVo
.
getContractEnd
())){
if
(
preVo
.
getContractEnd
().
before
(
preVo
.
getContractStart
())){
if
(
!
preVo
.
getContractEnd
().
after
(
preVo
.
getContractStart
())){
return
"合同截止日期需大于
等于
合同开始日期"
;
return
"合同截止日期需大于合同开始日期"
;
}
}
}
}
//更新岗位名称
//更新岗位名称
...
@@ -1019,7 +1019,15 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -1019,7 +1019,15 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
//更新合同的办理状态
//更新合同的办理状态
updateEmpContractAlertHandleStatus
(
contractPre
.
getContractId
(),
CommonConstants
.
ONE_STRING
);
updateEmpContractAlertHandleStatus
(
contractPre
.
getContractId
(),
CommonConstants
.
ONE_STRING
);
// 更新processStatus为电子签发起失败
// 如果之前是发起失败状态,清空错误信息
if
(
CommonConstants
.
FIVE_STRING
.
equals
(
contractPreTemp
.
getProcessStatus
()))
{
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
clearErrorWrapper
=
new
LambdaUpdateWrapper
<>();
clearErrorWrapper
.
eq
(
TEmployeeContractPreNew:
:
getId
,
contractPreTemp
.
getId
())
.
set
(
TEmployeeContractPreNew:
:
getErrorInfo
,
null
)
.
set
(
TEmployeeContractPreNew:
:
getErrorTime
,
null
);
this
.
update
(
clearErrorWrapper
);
}
// 更新processStatus为电子签签署中
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeContractPreNew:
:
getId
,
contractPreTemp
.
getId
())
updateWrapper
.
eq
(
TEmployeeContractPreNew:
:
getId
,
contractPreTemp
.
getId
())
.
set
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
SIX_STRING
);
.
set
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
SIX_STRING
);
...
@@ -1118,11 +1126,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -1118,11 +1126,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
else
{
}
else
{
//处理成功更新数据
//处理成功更新数据
EmployeeContractVO
contractVO
=
disList
.
stream
().
filter
(
vo
->
Objects
.
equals
(
vo
.
getRowIndex
(),
errorMessage
.
getLineNum
())).
collect
(
Collectors
.
toList
()).
get
(
0
);
EmployeeContractVO
contractVO
=
disList
.
stream
().
filter
(
vo
->
Objects
.
equals
(
vo
.
getRowIndex
(),
errorMessage
.
getLineNum
())).
collect
(
Collectors
.
toList
()).
get
(
0
);
// 先查询旧状态,判断是否需要清空错误信息
TEmployeeContractPreNew
oldPre
=
baseMapper
.
selectById
(
contractVO
.
getPreNewId
());
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
in
(
TEmployeeContractPreNew:
:
getId
,
contractVO
.
getPreNewId
())
updateWrapper
.
in
(
TEmployeeContractPreNew:
:
getId
,
contractVO
.
getPreNewId
())
.
in
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
contractDIsStatus
)
.
in
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
contractDIsStatus
)
.
set
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
set
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
set
(
TEmployeeContractPreNew:
:
getSignType
,
CommonConstants
.
ONE_STRING
);
.
set
(
TEmployeeContractPreNew:
:
getSignType
,
CommonConstants
.
ONE_STRING
);
// 如果之前是发起失败状态,清空错误信息
if
(
Common
.
isNotNull
(
oldPre
)
&&
CommonConstants
.
FIVE_STRING
.
equals
(
oldPre
.
getProcessStatus
()))
{
updateWrapper
.
set
(
TEmployeeContractPreNew:
:
getErrorInfo
,
null
)
.
set
(
TEmployeeContractPreNew:
:
getErrorTime
,
null
);
}
this
.
update
(
updateWrapper
);
this
.
update
(
updateWrapper
);
//更新合同的办理状态
//更新合同的办理状态
updateEmpContractAlertHandleStatus
(
contractVO
.
getContractId
(),
CommonConstants
.
ONE_STRING
);
updateEmpContractAlertHandleStatus
(
contractVO
.
getContractId
(),
CommonConstants
.
ONE_STRING
);
...
@@ -1134,11 +1149,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -1134,11 +1149,18 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
if
(
errorMessage
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
)){
if
(
errorMessage
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
)){
//处理成功更新数据
//处理成功更新数据
EmployeeContractVO
contractVO
=
disList
.
stream
().
filter
(
vo
->
Objects
.
equals
(
vo
.
getRowIndex
(),
errorMessage
.
getLineNum
())).
collect
(
Collectors
.
toList
()).
get
(
0
);
EmployeeContractVO
contractVO
=
disList
.
stream
().
filter
(
vo
->
Objects
.
equals
(
vo
.
getRowIndex
(),
errorMessage
.
getLineNum
())).
collect
(
Collectors
.
toList
()).
get
(
0
);
// 先查询旧状态,判断是否需要清空错误信息
TEmployeeContractPreNew
oldPre
=
baseMapper
.
selectById
(
contractVO
.
getPreNewId
());
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeContractPreNew:
:
getId
,
contractVO
.
getPreNewId
())
updateWrapper
.
eq
(
TEmployeeContractPreNew:
:
getId
,
contractVO
.
getPreNewId
())
.
in
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
contractDIsStatus
)
.
in
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
contractDIsStatus
)
.
set
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
set
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
set
(
TEmployeeContractPreNew:
:
getSignType
,
CommonConstants
.
ONE_STRING
);
.
set
(
TEmployeeContractPreNew:
:
getSignType
,
CommonConstants
.
ONE_STRING
);
// 如果之前是发起失败状态,清空错误信息
if
(
Common
.
isNotNull
(
oldPre
)
&&
CommonConstants
.
FIVE_STRING
.
equals
(
oldPre
.
getProcessStatus
()))
{
updateWrapper
.
set
(
TEmployeeContractPreNew:
:
getErrorInfo
,
null
)
.
set
(
TEmployeeContractPreNew:
:
getErrorTime
,
null
);
}
this
.
update
(
updateWrapper
);
this
.
update
(
updateWrapper
);
//更新合同的办理状态
//更新合同的办理状态
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
f9a9e04d
...
@@ -495,6 +495,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -495,6 +495,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
audit
.
setCreateName
(
"法大大电子签"
);
audit
.
setCreateName
(
"法大大电子签"
);
audit
.
setCreateBy
(
"1"
);
audit
.
setCreateBy
(
"1"
);
tEmployeeContractAuditService
.
save
(
audit
);
tEmployeeContractAuditService
.
save
(
audit
);
// 如果之前是发起失败状态,清空错误信息
if
(
CommonConstants
.
FIVE_STRING
.
equals
(
contractPre
.
getProcessStatus
()))
{
LambdaUpdateWrapper
<
TEmployeeContractPre
>
clearErrorWrapper
=
new
LambdaUpdateWrapper
<>();
clearErrorWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
null
)
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
null
);
this
.
update
(
clearErrorWrapper
);
}
}
}
}
}
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
f9a9e04d
...
@@ -2712,7 +2712,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2712,7 +2712,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
if
(
Common
.
isNotNull
(
contractPre
))
{
String
oldStatus
=
contractPre
.
getProcessStatus
();
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
// 如果之前是发起失败状态,清空错误信息
if
(
CommonConstants
.
FIVE_STRING
.
equals
(
oldStatus
))
{
contractPre
.
setErrorInfo
(
null
);
contractPre
.
setErrorTime
(
null
);
}
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
//瓜子项目编码:皖A694302
//瓜子项目编码:皖A694302
...
@@ -2763,10 +2769,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2763,10 +2769,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
//更新合同状态为2线下签审核不通过
//更新合同状态为2线下签审核不通过
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
c
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getContractId
,
c
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE_STRING
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
if
(
Common
.
isNotNull
(
contractPre
))
{
String
oldStatus
=
contractPre
.
getProcessStatus
();
contractPre
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
contractPre
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
// 如果之前是发起失败状态,清空错误信息
if
(
CommonConstants
.
FIVE_STRING
.
equals
(
oldStatus
))
{
contractPre
.
setErrorInfo
(
null
);
contractPre
.
setErrorTime
(
null
);
}
contractPreMapper
.
updateById
(
contractPre
);
contractPreMapper
.
updateById
(
contractPre
);
}
}
c
.
setAuditStatus
(
CommonConstants
.
THREE_INT
);
c
.
setAuditStatus
(
CommonConstants
.
THREE_INT
);
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
f9a9e04d
...
@@ -970,7 +970,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -970,7 +970,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
private
void
initFundStartDate
(
TDispatchInfoPreVo
preVo
)
{
private
void
initFundStartDate
(
TDispatchInfoPreVo
preVo
)
{
if
(
null
==
preVo
.
get
FundStart
Date
())
{
if
(
null
==
preVo
.
get
JoinLeave
Date
())
{
TEmployeeContractDateVo
initDate
=
new
TEmployeeContractDateVo
();
TEmployeeContractDateVo
initDate
=
new
TEmployeeContractDateVo
();
//先计算起缴日期 接收方式 0项目配置 自定义必须填写起缴日期
//先计算起缴日期 接收方式 0项目配置 自定义必须填写起缴日期
//0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月
//0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月
...
@@ -1282,21 +1282,21 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -1282,21 +1282,21 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractTerm
())){
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractTerm
())){
if
(!
employeeContractPreVo
.
getContractDurationYear
().
equals
(
employeeContractPreVo
.
getDispatchPeriodYear
())
if
(!
employeeContractPreVo
.
getContractDurationYear
().
equals
(
employeeContractPreVo
.
getDispatchPeriodYear
())
||
!
employeeContractPreVo
.
getContractDurationMonth
().
equals
(
employeeContractPreVo
.
getDispatchPeriodMonth
())){
||
!
employeeContractPreVo
.
getContractDurationMonth
().
equals
(
employeeContractPreVo
.
getDispatchPeriodMonth
())){
allErrorMessages
.
add
(
"劳务派遣合同
需要和标准合同
一致"
);
allErrorMessages
.
add
(
"劳务派遣合同
年限需要和标准合同年限
一致"
);
}
}
}
}
// 如果有错误信息,一起返回
if
(!
allErrorMessages
.
isEmpty
())
{
return
"合同的年限、开始日期、截止日期同派遣的期限、开始日期、截止日期不一致,请调整!"
;
}
// 校验合同有效期:合同截止日期不得早于合同开始日期
// 校验合同有效期:合同截止日期不得早于合同开始日期
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
if
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractEnd
()))
{
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractEnd
()))
{
if
(
employeeContractPreVo
.
getContractEnd
().
before
(
employeeContractPreVo
.
getContractStart
()))
{
if
(
!
employeeContractPreVo
.
getContractEnd
().
after
(
employeeContractPreVo
.
getContractStart
()))
{
allErrorMessages
.
add
(
"合同截止日期需大于等于合同开始日期"
)
;
return
"合同截止日期需大于合同开始日期"
;
}
}
}
}
// 如果有错误信息,一起返回
if
(!
allErrorMessages
.
isEmpty
())
{
return
String
.
join
(
";"
,
allErrorMessages
);
}
return
null
;
return
null
;
}
}
...
@@ -2484,7 +2484,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -2484,7 +2484,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
preVo
.
getIsCreateDate
()))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
preVo
.
getIsCreateDate
()))
{
//原社保起缴日期类型为 0 入职日期 新:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月
//原社保起缴日期类型为 0 入职日期 新:0 入职日期 1 入职满1个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月
// 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
// 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月
if
(
Common
.
isEmpty
(
preVo
.
getSocialStart
Date
()))
{
if
(
!
Common
.
isEmpty
(
preVo
.
getJoinLeave
Date
()))
{
if
(
Common
.
isNotNull
(
preVo
.
getSocialDateType
())){
if
(
Common
.
isNotNull
(
preVo
.
getSocialDateType
())){
TEmployeeContractDateVo
vo
=
new
TEmployeeContractDateVo
();
TEmployeeContractDateVo
vo
=
new
TEmployeeContractDateVo
();
vo
.
setMonthAfter
(
Integer
.
parseInt
(
preVo
.
getSocialDateType
()));
vo
.
setMonthAfter
(
Integer
.
parseInt
(
preVo
.
getSocialDateType
()));
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TEmployeeInsurancePreExportVo.java
View file @
f9a9e04d
...
@@ -129,9 +129,9 @@ public class TEmployeeInsurancePreExportVo implements Serializable {
...
@@ -129,9 +129,9 @@ public class TEmployeeInsurancePreExportVo implements Serializable {
@ExcelProperty
(
"状态"
)
@ExcelProperty
(
"状态"
)
private
String
processStatus
;
private
String
processStatus
;
@ExcelAttribute
(
name
=
"
发起
失败原因"
)
@ExcelAttribute
(
name
=
"
派单
失败原因"
)
@ExcelProperty
(
"
发起
失败原因"
)
@ExcelProperty
(
"
派单
失败原因"
)
@Schema
(
description
=
"
发起
失败原因"
)
@Schema
(
description
=
"
派单
失败原因"
)
private
String
errorInfo
;
private
String
errorInfo
;
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TInsuranceAlertExportVO.java
View file @
f9a9e04d
...
@@ -109,6 +109,6 @@ public class TInsuranceAlertExportVO {
...
@@ -109,6 +109,6 @@ public class TInsuranceAlertExportVO {
private
String
customerUsername
;
private
String
customerUsername
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"失败原因"
)
@ExcelProperty
(
value
=
"
派单
失败原因"
)
private
String
errorInfo
;
private
String
errorInfo
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoPreExportVo.java
View file @
f9a9e04d
...
@@ -170,11 +170,11 @@ public class TDispatchInfoPreExportVo implements Serializable {
...
@@ -170,11 +170,11 @@ public class TDispatchInfoPreExportVo implements Serializable {
/**
/**
* 发起失败原因
* 发起失败原因
*/
*/
@ExcelAttribute
(
name
=
"
发起
失败原因"
,
maxLength
=
500
)
@ExcelAttribute
(
name
=
"
派单
失败原因"
,
maxLength
=
500
)
@Schema
(
description
=
"
发起
失败原因"
)
@Schema
(
description
=
"
派单
失败原因"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ColumnWidth
(
25
)
@ColumnWidth
(
25
)
@ExcelProperty
(
"
发起
失败原因"
)
@ExcelProperty
(
"
派单
失败原因"
)
private
String
errorInfo
;
private
String
errorInfo
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoPreFundExportVo.java
View file @
f9a9e04d
...
@@ -148,11 +148,11 @@ public class TDispatchInfoPreFundExportVo implements Serializable {
...
@@ -148,11 +148,11 @@ public class TDispatchInfoPreFundExportVo implements Serializable {
/**
/**
* 发起失败原因
* 发起失败原因
*/
*/
@ExcelAttribute
(
name
=
"
发起
失败原因"
,
maxLength
=
500
)
@ExcelAttribute
(
name
=
"
派单
失败原因"
,
maxLength
=
500
)
@Schema
(
description
=
"
发起
失败原因"
)
@Schema
(
description
=
"
派单
失败原因"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ColumnWidth
(
25
)
@ColumnWidth
(
25
)
@ExcelProperty
(
"
发起
失败原因"
)
@ExcelProperty
(
"
派单
失败原因"
)
private
String
errorInfo
;
private
String
errorInfo
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
f9a9e04d
...
@@ -1163,11 +1163,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1163,11 +1163,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
dispatch
.
getPreId
()))
{
if
(
Common
.
isNotNull
(
dispatch
.
getPreId
()))
{
TDispatchInfoPre
dispatchInfoPre
=
dispatchInfoPreMapper
.
selectById
(
dispatch
.
getPreId
());
TDispatchInfoPre
dispatchInfoPre
=
dispatchInfoPreMapper
.
selectById
(
dispatch
.
getPreId
());
if
(
Common
.
isNotNull
(
dispatchInfoPre
))
{
if
(
Common
.
isNotNull
(
dispatchInfoPre
))
{
// 当状态从派单失败(2)变更为待审核(3)时,清空错误信息
if
(
CommonConstants
.
TWO_STRING
.
equals
(
dispatchInfoPre
.
getProcessStatus
()))
{
dispatchInfoPre
.
setErrorInfo
(
null
);
dispatchInfoPre
.
setErrorTime
(
null
);
}
dispatchInfoPre
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
dispatchInfoPre
.
setProcessStatus
(
CommonConstants
.
THREE_STRING
);
dispatchInfoPre
.
setDispatcherId
(
socialFund
.
getDispatchId
());
dispatchInfoPre
.
setDispatcherId
(
socialFund
.
getDispatchId
());
dispatchInfoPre
.
setSocialFundId
(
socialFund
.
getId
());
dispatchInfoPre
.
setSocialFundId
(
socialFund
.
getId
());
dispatchInfoPre
.
setErrorInfo
(
null
);
dispatchInfoPre
.
setErrorTime
(
null
);
dispatchInfoPreMapper
.
updateById
(
dispatchInfoPre
);
dispatchInfoPreMapper
.
updateById
(
dispatchInfoPre
);
}
}
}
}
...
...
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