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
6f540bcf
Commit
6f540bcf
authored
Mar 06, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
5abe14e2
e4e1175f
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
365 additions
and
144 deletions
+365
-144
ContractAlertConfirmResVo.java
...d/plus/v1/yifu/archives/vo/ContractAlertConfirmResVo.java
+149
-0
ContractAlertConfirmVo.java
...loud/plus/v1/yifu/archives/vo/ContractAlertConfirmVo.java
+19
-0
TEmployeeAutoRegistCheckVo.java
.../plus/v1/yifu/archives/vo/TEmployeeAutoRegistCheckVo.java
+3
-0
TEmployeeContractPreNewVo.java
...d/plus/v1/yifu/archives/vo/TEmployeeContractPreNewVo.java
+6
-0
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+4
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-1
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+177
-141
DoFascTask.java
...om/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
+5
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ContractAlertConfirmResVo.java
0 → 100644
View file @
6f540bcf
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* @Author fxj
* @Date 2022/7/1
* @Description
* @Version 1.0
*/
@Data
public
class
ContractAlertConfirmResVo
implements
Serializable
{
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
deptName
;
@ExcelAttribute
(
name
=
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
private
String
deptNo
;
/**
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@ExcelAttribute
(
name
=
"主键"
)
@Schema
(
description
=
"主键"
)
@ExcelIgnore
private
String
id
;
/**
* 员工名称
*/
@ExcelAttribute
(
name
=
"员工名称"
)
@Schema
(
description
=
"员工名称"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"员工名称"
)
private
String
empName
;
/**
* 身份证号
*/
@ExcelAttribute
(
name
=
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"身份证号"
)
private
String
empIdcard
;
/**
* 上一份合同起止日期
*/
@Schema
(
description
=
"上一份合同起止日期"
)
private
String
lastContractEndAndStart
;
/**
* 就职岗位
*/
@ExcelAttribute
(
name
=
"就职岗位"
)
@Schema
(
description
=
"就职岗位"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"就职岗位"
)
private
String
post
;
/**
* 合同类型
*/
@ExcelAttribute
(
name
=
"合同类型"
)
@Schema
(
description
=
"合同类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同类型"
)
private
String
contractType
;
/**
* 签署甲方
*/
@ExcelAttribute
(
name
=
"签署甲方"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"签署甲方不能超过50个字符"
)
@ExcelProperty
(
"签署甲方"
)
@Schema
(
description
=
"签署甲方"
)
private
String
signatory
;
/**
* 签署方式
*/
@ExcelAttribute
(
name
=
"签署方式"
,
maxLength
=
32
)
@ExcelProperty
(
"签署方式"
)
@Schema
(
description
=
"签署方式1线下签0电子签"
)
private
String
signType
;
/**
* 合同开始日期
*/
@ExcelAttribute
(
name
=
"合同开始日期"
)
@Schema
(
description
=
"合同开始日期"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同开始日期"
)
private
Date
contractStart
;
/**
* 合同截止日期
*/
@ExcelAttribute
(
name
=
"合同截止日期"
)
@Schema
(
description
=
"合同截止日期"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同截止日期"
)
private
Date
contractEnd
;
/**
* 合同截止日期-续签
*/
@ExcelAttribute
(
name
=
"合同截止日期-续签"
)
@Schema
(
description
=
"合同截止日期-续签"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同截止日期-续签"
)
private
Date
contractEndNew
;
/**
* 合同开始日期-续签
*/
@ExcelAttribute
(
name
=
"合同开始日期-续签"
)
@Schema
(
description
=
"合同开始日期-续签"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"合同开始日期-续签"
)
private
Date
contractStartNew
;
/**
* 合同ID
*/
@ExcelAttribute
(
name
=
"合同ID"
,
isExport
=
false
)
@Schema
(
description
=
"合同ID"
)
@ExcelIgnore
private
String
contractId
;
@ExcelAttribute
(
name
=
"错误信息"
)
@Schema
(
description
=
"错误信息"
)
@ExcelProperty
(
"错误信息"
)
private
String
errorMsg
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ContractAlertConfirmVo.java
View file @
6f540bcf
...
...
@@ -125,4 +125,23 @@ public class ContractAlertConfirmVo implements Serializable {
@ExcelIgnore
private
String
contractId
;
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
@ExcelProperty
(
"项目名称"
)
private
String
deptName
;
@ExcelAttribute
(
name
=
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
private
String
deptNo
;
@ExcelAttribute
(
name
=
"错误信息"
)
@Schema
(
description
=
"错误信息"
)
@ExcelProperty
(
"错误信息"
)
private
String
errorMsg
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeAutoRegistCheckVo.java
View file @
6f540bcf
...
...
@@ -47,4 +47,7 @@ public class TEmployeeAutoRegistCheckVo implements Serializable {
@ExcelProperty
(
"错误信息"
)
private
String
errorMsg
;
//反馈文件要求
ContractAlertConfirmResVo
confirmVo
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreNewVo.java
View file @
6f540bcf
...
...
@@ -721,4 +721,10 @@ public class TEmployeeContractPreNewVo extends TEmployeeContractPreNew implement
**/
private
List
<
String
>
contractIds
;
/**
* @Author fxj
* @Description 批量确认返回对象
**/
private
List
<
ContractAlertConfirmResVo
>
confirmVos
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
6f540bcf
...
...
@@ -107,4 +107,8 @@ public class EmployeeConstants {
public
static
final
String
DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR
=
"待续签合同超期一个月,需走线下签"
;
public
static
final
String
ERROR_TYPE_CONTRACT
=
"合同"
;
public
static
final
String
ERROR_DUPLICATE_CONFIRM
=
"已确认,请勿重复确认"
;
public
static
final
String
ERROR_NO_ALERT_FOUND
=
"未找到合同续签待办信息"
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
6f540bcf
...
...
@@ -1059,7 +1059,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//更新合同提醒办理状态
LambdaUpdateWrapper
<
TEmpContractAlert
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmpContractAlert:
:
getContractId
,
contractPreNew
.
getContractId
())
.
eq
(
TEmpContractAlert:
:
getHandleStatus
,
CommonConstants
.
ZERO_STRING
);
.
set
(
TEmpContractAlert:
:
getHandleStatus
,
CommonConstants
.
ZERO_STRING
);
contractAlertMapper
.
update
(
null
,
updateWrapper
);
}
}
if
(
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
contractInfo
.
getSituation
()))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
6f540bcf
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
View file @
6f540bcf
...
...
@@ -147,6 +147,8 @@ public class DoFascTask {
preNew
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
preNew
.
setRevokeReason
(
Common
.
isEmpty
(
terminationNote
)?
CommonConstants
.
EMPTY_STRING
:
terminationNote
);
tEmployeeContractPreNewService
.
updateById
(
preNew
);
//更新合同待办
tEmployeeContractPreNewService
.
updateByIdAndUpdateAlert
(
preNew
);
}
//如果存在合同申请审核数据,将状态更新成5撤销签署
contractInfo
.
setAuditStatus
(
CommonConstants
.
FIVE_INT
);
...
...
@@ -178,9 +180,10 @@ public class DoFascTask {
contractAutoLog
.
setMainId
(
preNew
.
getId
());
contractAutoLog
.
setErrorInfo
(
null
==
terminationNote
?
"法大大签署失败"
:
terminationNote
);
contractAutoLogService
.
save
(
contractAutoLog
);
//更新合同待办
tEmployeeContractPreNewService
.
updateByIdAndUpdateAlert
(
preNew
);
//签署失败发送企微消息
sendFddFalureInfoToWx
(
preNew
,
contractAutoLog
.
getId
());
// 加日志
this
.
saveAuditLogFail
(
"签署失败"
,
terminationNote
,
contractInfo
.
getId
());
pushLog
.
setReturnData
(
"签署任务参与方签署失败事件:fddEvent:"
+
fddEvent
+
FASC_BIZ_CONTENT_STR
+
fddBizContent
);
...
...
@@ -492,7 +495,7 @@ public class DoFascTask {
StringBuilder
description
=
new
StringBuilder
();
String
title
=
"作业自动化——电子合同续签失败提醒"
;
description
.
append
(
pre
.
getEmployeeName
()
+
"-"
+
pre
.
getEmpIdcard
()
+
"-"
+
pre
.
getEmpPhone
()
+
",电子合同
签署
失败"
).
append
(
"<br>"
);
",电子合同
续签
失败"
).
append
(
"<br>"
);
description
.
append
(
"请及时处理,以免产生用工风险!"
).
append
(
"<br>"
);
textcard
.
put
(
"title"
,
title
);
textcard
.
put
(
"url"
,
authUrl
);
...
...
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