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
5aaf17ee
Commit
5aaf17ee
authored
Mar 11, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同续签待办-fxj
parent
ef69bb1e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
TEmpContractAlertExportVo.java
...d/plus/v1/yifu/archives/vo/TEmpContractAlertExportVo.java
+2
-2
TEmpContractAlertController.java
...yifu/archives/controller/TEmpContractAlertController.java
+1
-0
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+9
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmpContractAlertExportVo.java
View file @
5aaf17ee
...
...
@@ -287,11 +287,11 @@ public class TEmpContractAlertExportVo {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"签署方式"
)
@Schema
(
description
=
"签署方式:1线下签0电子签"
)
private
Integer
signType
;
private
String
signType
;
/**
* 续签状态:0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署
*/
@ExcelAttribute
(
name
=
"续签状态"
,
readConverterExp
=
"0=待确认,1=待发起,2=线
待审核,3=审核不通过,4=线下签待归档,5=发起失败,6=签署中,7=签署失败,8=电子待归档,9=已归档,10=撤销签署-客服撤销
11=撤销签署-系统自动撤销"
)
@ExcelAttribute
(
name
=
"续签状态"
,
readConverterExp
=
"0=待确认,1=待发起,2=线
下签待审核,3=线下签审核不通过,4=线下签待归档,5=发起失败,6=签署中,7=签署失败,8=电子待归档,9=已完结,10=撤销签署-客服撤销,
11=撤销签署-系统自动撤销"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"续签状态"
)
@Schema
(
description
=
"签署方式:0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署-客服撤销 11撤销签署-系统自动撤销"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpContractAlertController.java
View file @
5aaf17ee
...
...
@@ -336,6 +336,7 @@ public class TEmpContractAlertController {
@Operation
(
description
=
"导出自动化续签待办"
)
@PostMapping
(
"/autoExport"
)
public
void
autoExport
(
HttpServletResponse
response
,
@RequestBody
ContractAlertSearchVo
searchVo
)
{
searchVo
.
setAutoFlag
(
CommonConstants
.
ZERO_STRING
);
tEmpContractAlertService
.
listAutoExport
(
response
,
searchVo
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
5aaf17ee
...
...
@@ -1151,12 +1151,19 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
searchVo
.
setIdList
(
Arrays
.
asList
(
searchVo
.
getIds
().
split
(
CommonConstants
.
COMMA_STRING
)));
}
// 如果查询条件续签状态为空默认查询 非已完成 状态数据
if
(
Common
.
isNotNull
(
searchVo
.
getProcessStatusList
())){
if
(
!
Common
.
isNotNull
(
searchVo
.
getProcessStatusList
())){
searchVo
.
setProcessStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
,
"10"
,
"11"
).
collect
(
Collectors
.
toList
()));
}
//初始化客服的项目权限 ,管理员及SSC 全量
initSearchVo
(
searchVo
);
if
(
ArrayUtil
.
isNotEmpty
(
searchVo
.
getStartEndTimecreate
())
&&
searchVo
.
getStartEndTimecreate
().
length
==
2
)
{
searchVo
.
setExpectedCollectionTimeStart
(
searchVo
.
getStartEndTimecreate
()[
0
]);
searchVo
.
setExpectedCollectionTimeEnd
(
searchVo
.
getStartEndTimecreate
()[
1
]);
}
//默认导出自动化的合同续签待办
searchVo
.
setAutoFlag
(
CommonConstants
.
ZERO_STRING
);
initSearchVo
(
searchVo
);
String
fileName
=
ArchivesConstants
.
EMP_AUTO_RENEWAL_RECORD
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
//获取要导出的列表
List
<
TEmpContractAlertExportVo
>
list
=
new
ArrayList
<>();
...
...
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