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
88b2b9f5
Commit
88b2b9f5
authored
Oct 17, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
b5b7c907
1e409a9c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
79 additions
and
20 deletions
+79
-20
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+3
-0
EmployeeContractVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
+3
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+5
-0
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+51
-19
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+11
-0
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+2
-1
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+4
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
88b2b9f5
...
@@ -463,6 +463,9 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -463,6 +463,9 @@ public class TEmployeeContractInfo extends BaseEntity {
@Schema
(
description
=
"作废、终止选择的合同id"
,
name
=
"reason"
)
@Schema
(
description
=
"作废、终止选择的合同id"
,
name
=
"reason"
)
private
String
oldContractId
;
private
String
oldContractId
;
@Schema
(
description
=
"签署方式1线下签0电子签"
)
private
String
signType
;
/**
/**
* 是否附件 0是/1否
* 是否附件 0是/1否
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @
88b2b9f5
...
@@ -207,6 +207,9 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
...
@@ -207,6 +207,9 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelProperty
(
"备注"
)
@ExcelProperty
(
"备注"
)
private
String
remark
;
private
String
remark
;
@Schema
(
description
=
"签署方式1线下签0电子签"
)
private
String
signType
;
/**
/**
* 0 是 1 否
* 0 是 1 否
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
88b2b9f5
...
@@ -1447,6 +1447,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1447,6 +1447,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// b = b.setScale(1, BigDecimal.ROUND_HALF_UP);
// b = b.setScale(1, BigDecimal.ROUND_HALF_UP);
// insert.setContractTerm(String.valueOf(b));
// insert.setContractTerm(String.valueOf(b));
}
}
// 处理signType字段
if
(
Common
.
isNotNull
(
excel
.
getSignType
()))
{
insert
.
setSignType
(
excel
.
getSignType
());
}
// 核心保存
// 核心保存
R
<
List
<
ErrorMessage
>>
info
=
this
.
setBaseInfo
(
insert
,
project
);
R
<
List
<
ErrorMessage
>>
info
=
this
.
setBaseInfo
(
insert
,
project
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
info
.
getMsg
()));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
info
.
getMsg
()));
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
88b2b9f5
...
@@ -296,7 +296,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -296,7 +296,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
// 拆分电子签和线下签
// 拆分电子签和线下签
List
<
EmployeeContractVO
>
electronicSignList
=
new
ArrayList
<>();
List
<
EmployeeContractVO
>
electronicSignList
=
new
ArrayList
<>();
List
<
EmployeeContractVO
>
offlineSignList
=
new
ArrayList
<>();
List
<
EmployeeContractVO
>
offlineSignList
=
new
ArrayList
<>();
if
(
Common
.
isNotNull
(
excelVOList
)
&&
!
excelVOList
.
isEmpty
())
{
if
(
Common
.
isNotNull
(
excelVOList
)
&&
!
excelVOList
.
isEmpty
())
{
for
(
EmployeeContractVO
contractVO
:
excelVOList
)
{
for
(
EmployeeContractVO
contractVO
:
excelVOList
)
{
TEmployeeContractPre
contractPre
=
preContractMap
.
get
(
contractVO
.
getPreId
());
TEmployeeContractPre
contractPre
=
preContractMap
.
get
(
contractVO
.
getPreId
());
...
@@ -309,14 +309,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -309,14 +309,14 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
}
}
}
}
}
}
// 按前端客服分组统计
// 按前端客服分组统计
Map
<
String
,
CustomerStatistics
>
customerStatisticsMap
=
new
HashMap
<>();
Map
<
String
,
CustomerStatistics
>
customerStatisticsMap
=
new
HashMap
<>();
// 处理电子签合同
// 处理电子签合同
if
(!
electronicSignList
.
isEmpty
())
{
if
(!
electronicSignList
.
isEmpty
())
{
LocalDate
currentDate
=
LocalDate
.
now
();
LocalDate
currentDate
=
LocalDate
.
now
();
for
(
EmployeeContractVO
contractVO
:
electronicSignList
)
{
for
(
EmployeeContractVO
contractVO
:
electronicSignList
)
{
TEmployeeContractPre
contractPre
=
preContractMap
.
get
(
contractVO
.
getPreId
());
TEmployeeContractPre
contractPre
=
preContractMap
.
get
(
contractVO
.
getPreId
());
if
(
contractPre
!=
null
&&
contractPre
.
getJoinLeaveDate
()
!=
null
)
{
if
(
contractPre
!=
null
&&
contractPre
.
getJoinLeaveDate
()
!=
null
)
{
...
@@ -329,44 +329,51 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -329,44 +329,51 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
return
stats
;
return
stats
;
});
});
customerStats
.
setInitiatedCount
(
customerStats
.
getInitiatedCount
()
+
1
);
customerStats
.
setInitiatedCount
(
customerStats
.
getInitiatedCount
()
+
1
);
LocalDate
joinDate
=
LocalDateTimeUtils
.
convertDateToLDT
(
contractPre
.
getJoinLeaveDate
()).
toLocalDate
();
LocalDate
joinDate
=
LocalDateTimeUtils
.
convertDateToLDT
(
contractPre
.
getJoinLeaveDate
()).
toLocalDate
();
// 判断是否超过入职日期一个月
// 判断是否超过入职日期一个月
if
(
currentDate
.
isAfter
(
joinDate
.
plusMonths
(
1
)))
{
if
(
currentDate
.
isAfter
(
joinDate
.
plusMonths
(
1
)))
{
// 超过一个月,算电子签发起失败
// 超过一个月,算电子签发起失败
customerStats
.
setFailedCount
(
customerStats
.
getFailedCount
()
+
1
);
customerStats
.
setFailedCount
(
customerStats
.
getFailedCount
()
+
1
);
customerStats
.
setElectronicSignFailedCount
(
customerStats
.
getElectronicSignFailedCount
()
+
1
);
customerStats
.
setElectronicSignFailedCount
(
customerStats
.
getElectronicSignFailedCount
()
+
1
);
// 更新processStatus为电子签发起失败
// 更新processStatus为电子签发起失败
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE_STRING
)
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
"电子签发起失败:已超过入职日期一个月"
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
"电子签发起失败:已超过入职日期一个月"
)
.
set
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
.
set
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
this
.
update
(
updateWrapper
);
this
.
update
(
updateWrapper
);
// 添加错误信息
// 添加错误信息
ErrorMessage
<
EmployeeContractVO
>
errorMessage
=
new
ErrorMessage
<>(
contractVO
.
getRowIndex
(),
"电子签发起失败:已超过入职日期一个月"
);
ErrorMessage
<
EmployeeContractVO
>
errorMessage
=
new
ErrorMessage
<>(
contractVO
.
getRowIndex
(),
"电子签发起失败:已超过入职日期一个月"
);
errorMessage
.
setData
(
contractVO
);
errorMessage
.
setData
(
contractVO
);
errorMessageListAll
.
add
(
errorMessage
);
errorMessageListAll
.
add
(
errorMessage
);
}
else
{
}
else
{
// 未超过一个月,调用FascService的submitContract方法
// 未超过一个月,先调用contractInfoService.importContract方法创建合同
R
<
String
>
result
=
null
;
List
<
EmployeeContractVO
>
singleContractList
=
new
ArrayList
<>();
try
{
singleContractList
.
add
(
contractVO
);
result
=
fascService
.
submitContract
(
contractPre
.
getId
());
List
<
ErrorMessage
>
singleErrorMessageList
=
new
ArrayList
<>();
}
catch
(
Exception
e
)
{
log
.
error
(
"法大大推送执行异常"
,
e
);
// 调用合同导入方法
}
contractInfoService
.
importContract
(
singleContractList
,
singleErrorMessageList
);
if
(
result
==
null
||
result
.
getCode
()
!=
CommonConstants
.
SUCCESS
)
{
// 检查合同创建是否成功
boolean
contractCreateSuccess
=
singleErrorMessageList
.
stream
()
.
allMatch
(
message
->
message
.
getMessage
().
equals
(
CommonConstants
.
SAVE_SUCCESS
));
if
(!
contractCreateSuccess
)
{
// 合同创建失败,统计错误并更新状态
customerStats
.
setFailedCount
(
customerStats
.
getFailedCount
()
+
1
);
customerStats
.
setFailedCount
(
customerStats
.
getFailedCount
()
+
1
);
customerStats
.
setElectronicSignFailedCount
(
customerStats
.
getElectronicSignFailedCount
()
+
1
);
customerStats
.
setElectronicSignFailedCount
(
customerStats
.
getElectronicSignFailedCount
()
+
1
);
String
errorMsg
=
result
!=
null
?
result
.
getMsg
()
:
"电子签发起失败"
;
String
errorMsg
=
singleErrorMessageList
.
isEmpty
()
?
"合同创建失败"
:
singleErrorMessageList
.
get
(
0
).
getMessage
();
// 更新processStatus为电子签发起失败
// 更新processStatus为电子签发起失败
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
SIX
_STRING
)
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE
_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
errorMsg
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
errorMsg
)
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
this
.
update
(
updateWrapper
);
this
.
update
(
updateWrapper
);
...
@@ -375,6 +382,31 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -375,6 +382,31 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
ErrorMessage
<
EmployeeContractVO
>
errorMessage
=
new
ErrorMessage
<>(
contractVO
.
getRowIndex
(),
errorMsg
);
ErrorMessage
<
EmployeeContractVO
>
errorMessage
=
new
ErrorMessage
<>(
contractVO
.
getRowIndex
(),
errorMsg
);
errorMessage
.
setData
(
contractVO
);
errorMessage
.
setData
(
contractVO
);
errorMessageListAll
.
add
(
errorMessage
);
errorMessageListAll
.
add
(
errorMessage
);
}
else
{
// 合同创建成功,继续调用FascService的submitContract方法
R
<
String
>
result
=
null
;
try
{
result
=
fascService
.
submitContract
(
contractPre
.
getId
());
}
catch
(
Exception
e
)
{
log
.
error
(
"法大大推送执行异常"
,
e
);
}
if
(
result
==
null
||
result
.
getCode
()
!=
CommonConstants
.
SUCCESS
)
{
customerStats
.
setFailedCount
(
customerStats
.
getFailedCount
()
+
1
);
customerStats
.
setElectronicSignFailedCount
(
customerStats
.
getElectronicSignFailedCount
()
+
1
);
String
errorMsg
=
result
!=
null
?
result
.
getMsg
()
:
"电子签发起失败"
;
// 更新processStatus为电子签发起失败
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
SIX_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
errorMsg
)
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
this
.
update
(
updateWrapper
);
// 添加错误信息
ErrorMessage
<
EmployeeContractVO
>
errorMessage
=
new
ErrorMessage
<>(
contractVO
.
getRowIndex
(),
errorMsg
);
errorMessage
.
setData
(
contractVO
);
errorMessageListAll
.
add
(
errorMessage
);
}
}
}
}
}
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
88b2b9f5
...
@@ -144,6 +144,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -144,6 +144,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private
final
TGzPushEntryService
tGzPushEntryService
;
private
final
TGzPushEntryService
tGzPushEntryService
;
private
final
TEmployeeContractPreMapper
contractPreMapper
;
@Autowired
@Autowired
private
OSSUtil
ossUtil
;
private
OSSUtil
ossUtil
;
...
@@ -2624,6 +2626,15 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2624,6 +2626,15 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
//tEmployeeProjectService.updateContractStatus(c.getEmpId(), c.getSettleDomain(), CommonConstants.ONE_INT)
//tEmployeeProjectService.updateContractStatus(c.getEmpId(), c.getSettleDomain(), CommonConstants.ONE_INT)
baseMapper
.
updateContractStatus
(
c
.
getEmpId
(),
CommonConstants
.
ONE_INT
);
baseMapper
.
updateContractStatus
(
c
.
getEmpId
(),
CommonConstants
.
ONE_INT
);
//更新合同状态为4线下签待归档
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getContractId
,
c
.
getId
())
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
TWO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
contractPre
.
setProcessStatus
(
CommonConstants
.
FOUR_STRING
);
contractPreMapper
.
updateById
(
contractPre
);
}
//瓜子项目编码:皖A694302
//瓜子项目编码:皖A694302
if
(
CommonConstants
.
GZ_DEPT_NO
.
equals
(
c
.
getDeptNo
()))
{
if
(
CommonConstants
.
GZ_DEPT_NO
.
equals
(
c
.
getDeptNo
()))
{
//审核通过瓜子合同状态更新合同审核通过
//审核通过瓜子合同状态更新合同审核通过
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
88b2b9f5
...
@@ -79,6 +79,7 @@
...
@@ -79,6 +79,7 @@
<result
property=
"contractSubName"
column=
"CONTRACT_SUB_NAME"
/>
<result
property=
"contractSubName"
column=
"CONTRACT_SUB_NAME"
/>
<result
property=
"reason"
column=
"REASON"
/>
<result
property=
"reason"
column=
"REASON"
/>
<result
property=
"auditTimeLast"
column=
"AUDIT_TIME_LAST"
/>
<result
property=
"auditTimeLast"
column=
"AUDIT_TIME_LAST"
/>
<result
property=
"signType"
column=
"sign_type"
/>
<result
property=
"type"
column=
"TYPE"
/>
<result
property=
"type"
column=
"TYPE"
/>
<result
property=
"leaveDate"
column=
"LEAVE_DATE"
/>
<result
property=
"leaveDate"
column=
"LEAVE_DATE"
/>
...
@@ -208,7 +209,7 @@
...
@@ -208,7 +209,7 @@
a.AUDIT_USER_NAME,
a.AUDIT_USER_NAME,
a.REDUCE_REASON,
a.REDUCE_REASON,
a.type,
a.type,
a.TRY_PERIOD
a.TRY_PERIOD
,a.sign_type
</sql>
</sql>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
88b2b9f5
...
@@ -242,6 +242,9 @@
...
@@ -242,6 +242,9 @@
<if
test=
"tEmployeeContractPre.expectedCollectionTime != null"
>
<if
test=
"tEmployeeContractPre.expectedCollectionTime != null"
>
AND a.expected_collection_time = #{tEmployeeContractPre.expectedCollectionTime}
AND a.expected_collection_time = #{tEmployeeContractPre.expectedCollectionTime}
</if>
</if>
<if
test=
"tEmployeeContractPre.revokeReason != null and tEmployeeContractPre.revokeReason.trim() != ''"
>
AND a.revoke_reason = #{tEmployeeContractPre.revokeReason}
</if>
<if
test=
"tEmployeeContractPre.expectedConfirmTime != null"
>
<if
test=
"tEmployeeContractPre.expectedConfirmTime != null"
>
AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") =
AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") =
DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
...
@@ -354,6 +357,7 @@
...
@@ -354,6 +357,7 @@
null leaveDate,
null leaveDate,
null reduceReason,
null reduceReason,
null remark,
null remark,
a.sign_type signType,
null changeContractAndEmployee,
null changeContractAndEmployee,
if(a.TRY_PERIOD = '' or a.TRY_PERIOD is null,'无',a.TRY_PERIOD) as tryPeriod,
if(a.TRY_PERIOD = '' or a.TRY_PERIOD is null,'无',a.TRY_PERIOD) as tryPeriod,
a.id preId,
a.id preId,
...
...
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