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
1de7ced9
Commit
1de7ced9
authored
Oct 23, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
e725b55d
c97fc327
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
69 additions
and
65 deletions
+69
-65
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+2
-2
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+4
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-1
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+10
-10
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+49
-52
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-0
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
1de7ced9
...
...
@@ -58,8 +58,8 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同"
)
private
String
contractType
;
@ExcelAttribute
(
name
=
"签署方式"
,
isDataId
=
true
,
readConverterExp
=
"0=待确认,1=待发起,2=线下签待审核,3=线下签审核不通过
4=线下签待归档5=发起失败6=签署中7=签署失败8=电子待归档9=已完结10=撤销签署
"
)
@Schema
(
description
=
"状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9已完结10撤销签署"
)
@ExcelAttribute
(
name
=
"签署方式"
,
isDataId
=
true
,
readConverterExp
=
"0=待确认,1=待发起,2=线下签待审核,3=线下签审核不通过
,4=线下签待归档,5=发起失败,6=签署中,7=签署失败,8=电子待归档,9=已完结,10=撤销签署-客服撤销,11=撤销签署-系统自动撤销
"
)
@Schema
(
description
=
"状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9已完结10撤销签署
-客服撤销 11 撤销签署-系统自动撤销
"
)
private
String
processStatus
;
@Schema
(
description
=
"签署甲方"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
1de7ced9
...
...
@@ -1558,6 +1558,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
.
eq
(
TEmployeeContractPre:
:
getRegisterId
,
id
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contract
))
{
//特殊状态处理
if
(
Common
.
isNotNull
(
contract
.
getChangeTypeReason
()))
{
contract
.
setSignType
(
CommonConstants
.
ZERO_STRING
);
}
//附件赋值
List
<
TAttaInfo
>
attaContractInfo
=
attaInfoService
.
list
(
Wrappers
.<
TAttaInfo
>
query
().
lambda
()
.
eq
(
TAttaInfo:
:
getDomainId
,
contract
.
getId
()));
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
1de7ced9
...
...
@@ -542,7 +542,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getPreId
()))
{
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getId
,
tEmployeeContractInfo
.
getPreId
())
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfo
Status
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
contractDIs
Status
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
//合同状态初始为签署中
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
1de7ced9
...
...
@@ -84,7 +84,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
//权限赋值
initSearchVo
(
tEmployeeContractPre
);
if
(
Common
.
isEmpty
(
tEmployeeContractPre
.
getProcessStatus
())
&&
Common
.
isEmpty
(
tEmployeeContractPre
.
getStatusList
()))
{
tEmployeeContractPre
.
setStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
).
collect
(
Collectors
.
toList
()));
tEmployeeContractPre
.
setStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
,
"11"
).
collect
(
Collectors
.
toList
()));
}
return
baseMapper
.
getTEmployeeContractPrePage
(
page
,
tEmployeeContractPre
);
}
...
...
@@ -118,7 +118,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
}
initSearchVo
(
tEmployeeContractPre
);
if
(
Common
.
isEmpty
(
tEmployeeContractPre
.
getProcessStatus
())&&
Common
.
isEmpty
(
tEmployeeContractPre
.
getStatusList
()))
{
tEmployeeContractPre
.
setStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
).
collect
(
Collectors
.
toList
()));
tEmployeeContractPre
.
setStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
,
"11"
).
collect
(
Collectors
.
toList
()));
}
return
baseMapper
.
getTEmployeeContractPreExportCount
(
tEmployeeContractPre
);
}
...
...
@@ -136,7 +136,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
//权限赋值
initSearchVo
(
searchVo
);
if
(
Common
.
isEmpty
(
searchVo
.
getProcessStatus
())&&
Common
.
isEmpty
(
searchVo
.
getStatusList
()))
{
searchVo
.
setStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
).
collect
(
Collectors
.
toList
()));
searchVo
.
setStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
,
"11"
).
collect
(
Collectors
.
toList
()));
}
long
count
=
baseMapper
.
getTEmployeeContractPreExportCount
(
searchVo
);
try
(
ServletOutputStream
out
=
response
.
getOutputStream
();)
{
...
...
@@ -276,15 +276,15 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
}
@Override
public
R
dispatcherContract
(
List
<
String
>
idList
,
String
type
)
{
public
R
dispatcherContract
(
List
<
String
>
idList
,
String
type
)
{
List
<
TEmployeeContractPre
>
contractPreList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
.
lambda
().
in
(
TEmployeeContractPre:
:
getId
,
idList
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfo
Status
));
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
contractDIs
Status
));
// 如果没有找到任何未处理的合同待派单数据,返回失败消息
if
(
Common
.
isEmpty
(
contractPreList
))
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
}
// 创建一个Map映射preId到TEmployeeContractPre对象
Map
<
String
,
TEmployeeContractPre
>
preContractMap
=
contractPreList
.
stream
()
.
collect
(
Collectors
.
toMap
(
TEmployeeContractPre:
:
getId
,
pre
->
pre
));
...
...
@@ -293,7 +293,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
//发起派单
List
<
ErrorMessage
>
errorMessageListAll
=
new
ArrayList
<>();
List
<
EmployeeContractVO
>
excelVOList
=
baseMapper
.
getDisPatcherContractList
(
idList
,
CommonConstants
.
socialInfoStatus
,
type
);
// 拆分电子签和线下签
List
<
EmployeeContractVO
>
electronicSignList
=
new
ArrayList
<>();
List
<
EmployeeContractVO
>
offlineSignList
=
new
ArrayList
<>();
...
...
@@ -542,7 +542,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
in
(
TEmployeeContractPre:
:
getId
,
contractVO
.
getPreId
())
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
socialInfo
Status
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
contractDIs
Status
)
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE_STRING
)
.
set
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
errorMessage
.
getMessage
())
...
...
@@ -841,7 +841,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
// 撤销成功:状态更新为"待发起"(1) 且 签署方式变更为"线下签"(1)
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ONE_STRING
)
// 待发起
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ELEVEN_STRING
)
// 11 撤销签署-系统自动撤销
.
set
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
// 线下签
.
set
(
TEmployeeContractPre:
:
getRevokeReason
,
"超时未签署自行变更为线下签"
)
.
set
(
TEmployeeContractPre:
:
getChangeTypeReason
,
"超时未签署自行变更为线下签"
)
...
...
@@ -855,7 +855,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
audit
.
setRemark
(
"电子合同签署超过1个月未完成签署系统,自动撤销"
);
tEmployeeContractAuditService
.
save
(
audit
);
}
else
if
(
"已完成签署"
.
equals
(
revokeResult
.
getMsg
()))
{
// 撤销失败原因为已完成签署:更新为签署完成的"待归档"状态(8)
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
1de7ced9
...
...
@@ -172,66 +172,63 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
private
static
final
List
<
String
>
PRE_IGNORE_FIELD
=
new
ArrayList
<>();
static
{
IGNORE_FIELD
.
add
(
"createTime"
);
IGNORE_FIELD
.
add
(
"deptId"
);
IGNORE_FIELD
.
add
(
"dataSource"
);
IGNORE_FIELD
.
add
(
"createBy"
);
IGNORE_FIELD
.
add
(
"createName"
);
IGNORE_FIELD
.
add
(
"updateBy"
);
PRE_
IGNORE_FIELD
.
add
(
"createTime"
);
PRE_
IGNORE_FIELD
.
add
(
"deptId"
);
PRE_
IGNORE_FIELD
.
add
(
"dataSource"
);
PRE_
IGNORE_FIELD
.
add
(
"createBy"
);
PRE_
IGNORE_FIELD
.
add
(
"createName"
);
PRE_
IGNORE_FIELD
.
add
(
"updateBy"
);
}
private
static
final
List
<
String
>
CONTRACT_IGNORE_FIELD
=
new
ArrayList
<>();
static
{
IGNORE_FIELD
.
add
(
"joinLeaveDate"
);
IGNORE_FIELD
.
add
(
"createTime"
);
IGNORE_FIELD
.
add
(
"empPhone"
);
IGNORE_FIELD
.
add
(
"employeeName"
);
IGNORE_FIELD
.
add
(
"empIdcard"
);
IGNORE_FIELD
.
add
(
"deptNo"
);
IGNORE_FIELD
.
add
(
"deptName"
);
IGNORE_FIELD
.
add
(
"deptId"
);
IGNORE_FIELD
.
add
(
"customerUsername"
);
IGNORE_FIELD
.
add
(
"customerUserLoginname"
);
IGNORE_FIELD
.
add
(
"dataSource"
);
IGNORE_FIELD
.
add
(
"position"
);
IGNORE_FIELD
.
add
(
"contractId"
);
IGNORE_FIELD
.
add
(
"registerId"
);
IGNORE_FIELD
.
add
(
"createBy"
);
IGNORE_FIELD
.
add
(
"createName"
);
IGNORE_FIELD
.
add
(
"updateBy"
);
IGNORE_FIELD
.
add
(
"isAddress"
);
IGNORE_FIELD
.
add
(
"internshipPeriodNum"
);
IGNORE_FIELD
.
add
(
"tryPeriodNum"
);
IGNORE_FIELD
.
add
(
"id"
);
CONTRACT_IGNORE_FIELD
.
add
(
"joinLeaveDate"
);
CONTRACT_IGNORE_FIELD
.
add
(
"createTime"
);
CONTRACT_IGNORE_FIELD
.
add
(
"empPhone"
);
CONTRACT_IGNORE_FIELD
.
add
(
"employeeName"
);
CONTRACT_IGNORE_FIELD
.
add
(
"empIdcard"
);
CONTRACT_IGNORE_FIELD
.
add
(
"deptNo"
);
CONTRACT_IGNORE_FIELD
.
add
(
"deptName"
);
CONTRACT_IGNORE_FIELD
.
add
(
"deptId"
);
CONTRACT_IGNORE_FIELD
.
add
(
"changeTypeReason"
);
CONTRACT_IGNORE_FIELD
.
add
(
"changeTypeUser"
);
CONTRACT_IGNORE_FIELD
.
add
(
"changeTypeTime"
);
CONTRACT_IGNORE_FIELD
.
add
(
"dataSource"
);
CONTRACT_IGNORE_FIELD
.
add
(
"contractId"
);
CONTRACT_IGNORE_FIELD
.
add
(
"registerId"
);
CONTRACT_IGNORE_FIELD
.
add
(
"createBy"
);
CONTRACT_IGNORE_FIELD
.
add
(
"createName"
);
CONTRACT_IGNORE_FIELD
.
add
(
"updateBy"
);
CONTRACT_IGNORE_FIELD
.
add
(
"id"
);
}
private
static
final
List
<
String
>
SOCIAL_IGNORE_FIELD
=
new
ArrayList
<>();
static
{
IGNORE_FIELD
.
add
(
"joinLeaveDate"
);
IGNORE_FIELD
.
add
(
"createTime"
);
IGNORE_FIELD
.
add
(
"empName"
);
IGNORE_FIELD
.
add
(
"phone"
);
IGNORE_FIELD
.
add
(
"employeeName"
);
IGNORE_FIELD
.
add
(
"empIdcard"
);
IGNORE_FIELD
.
add
(
"deptNo"
);
IGNORE_FIELD
.
add
(
"deptName"
);
IGNORE_FIELD
.
add
(
"deptId"
);
IGNORE_FIELD
.
add
(
"customerUsername"
);
IGNORE_FIELD
.
add
(
"customerUserLoginname"
);
IGNORE_FIELD
.
add
(
"position"
);
IGNORE_FIELD
.
add
(
"contractId"
);
IGNORE_FIELD
.
add
(
"errorBackInfo"
);
IGNORE_FIELD
.
add
(
"errorInfo"
);
IGNORE_FIELD
.
add
(
"errorTime"
);
IGNORE_FIELD
.
add
(
"socialFundId"
);
IGNORE_FIELD
.
add
(
"dispatcherId"
);
IGNORE_FIELD
.
add
(
"contractStatus"
);
IGNORE_FIELD
.
add
(
"typeSub"
);
IGNORE_FIELD
.
add
(
"registerId"
);
IGNORE_FIELD
.
add
(
"createBy"
);
IGNORE_FIELD
.
add
(
"createName"
);
IGNORE_FIELD
.
add
(
"updateBy"
);
IGNORE_FIELD
.
add
(
"id"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"joinLeaveDate"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"createTime"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"empName"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"phone"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"employeeName"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"empIdcard"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"deptNo"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"deptName"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"deptId"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"customerUsername"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"customerUserLoginname"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"position"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"contractId"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"errorBackInfo"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"errorInfo"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"errorTime"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"socialFundId"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"dispatcherId"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"contractStatus"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"typeSub"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"registerId"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"createBy"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"createName"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"updateBy"
);
SOCIAL_
IGNORE_FIELD
.
add
(
"id"
);
}
@Override
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
1de7ced9
...
...
@@ -337,6 +337,7 @@
WHEN a.process_status =6 THEN "签署中"
WHEN a.process_status =7 THEN "签署失败"
WHEN a.process_status =8 THEN "电子待归档"
WHEN a.process_status =11 THEN "撤销签署-系统自动撤销"
ELSE a.process_status END as process_status,
if(b.id is null,'否','是') archives_is_create
FROM t_employee_contract_pre a
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
1de7ced9
...
...
@@ -648,6 +648,8 @@ public interface CommonConstants {
List
<
String
>
socialInfoStatus
=
Stream
.
of
(
"1"
,
"3"
,
"5"
,
"7"
).
collect
(
Collectors
.
toList
());
List
<
String
>
contractDIsStatus
=
Stream
.
of
(
"1"
,
"3"
,
"5"
,
"7"
,
"11"
).
collect
(
Collectors
.
toList
());
List
<
String
>
processInsurancesStatus
=
Stream
.
of
(
"1"
,
"2"
,
"5"
).
collect
(
Collectors
.
toList
());
List
<
String
>
processListPreArchivesStatus
=
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
).
collect
(
Collectors
.
toList
());
...
...
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