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
be8338f1
Commit
be8338f1
authored
Mar 11, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
a1aa825a
5aaf17ee
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
91 additions
and
27 deletions
+91
-27
ContractAlertSearchVo.java
...cloud/plus/v1/yifu/archives/vo/ContractAlertSearchVo.java
+7
-0
TEmpContractAlertExportVo.java
...d/plus/v1/yifu/archives/vo/TEmpContractAlertExportVo.java
+2
-2
TEmpContractAlertController.java
...yifu/archives/controller/TEmpContractAlertController.java
+1
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+1
-0
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+9
-2
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+59
-19
TEmpContractAlertMapper.xml
...biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
+2
-2
TEmployeeContractPreNewMapper.xml
...c/main/resources/mapper/TEmployeeContractPreNewMapper.xml
+10
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ContractAlertSearchVo.java
View file @
be8338f1
...
...
@@ -88,6 +88,13 @@ public class ContractAlertSearchVo extends TEmpContractAlert {
@TableField
(
exist
=
false
)
@Schema
(
description
=
"合同IDS"
)
private
List
<
String
>
idList
;
/**
* 确认信息IDS
*/
@TableField
(
exist
=
false
)
@Schema
(
description
=
"确认信息IDS"
)
private
List
<
String
>
preIdList
;
@Schema
(
description
=
"处理状态数组"
)
@TableField
(
exist
=
false
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmpContractAlertExportVo.java
View file @
be8338f1
...
...
@@ -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 @
be8338f1
...
...
@@ -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/EmployeeRegistrationPreServiceImpl.java
View file @
be8338f1
...
...
@@ -384,6 +384,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
for
(
TAttaInfoSaveVo
attaInfoVo
:
preVo
.
getAttaList
())
{
TAttaInfo
attaInfo
=
new
TAttaInfo
();
BeanUtils
.
copyProperties
(
attaInfoVo
,
attaInfo
);
attaInfo
.
setId
(
null
);
attaInfo
.
setDomainId
(
pre
.
getId
());
attaInfo
.
setCreateName
(
"确认接收同步"
);
attaInfoService
.
save
(
attaInfo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
be8338f1
...
...
@@ -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
<>();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
be8338f1
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
View file @
be8338f1
...
...
@@ -191,7 +191,7 @@
AND a.ID = #{tEmpContractAlert.id}
</if>
<if
test=
"tEmpContractAlert.empName != null and tEmpContractAlert.empName.trim() != ''"
>
AND a.EMP_NAME
= #{tEmpContractAlert.empName}
AND a.EMP_NAME
like concat('%', #{tEmpContractAlert.empName}, '%')
</if>
<if
test=
"tEmpContractAlert.empId != null and tEmpContractAlert.empId.trim() != ''"
>
AND a.EMP_ID = #{tEmpContractAlert.empId}
...
...
@@ -200,7 +200,7 @@
AND a.DEPT_ID = #{tEmpContractAlert.deptId}
</if>
<if
test=
"tEmpContractAlert.project != null and tEmpContractAlert.project.trim() != ''"
>
AND a.PROJECT
= #{tEmpContractAlert.project}
AND a.PROJECT
like concat('%', #{tEmpContractAlert.project}, '%')
</if>
<if
test=
"tEmpContractAlert.deptNoList != null and tEmpContractAlert.deptNoList.size > 0"
>
AND a.PROJECT in
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreNewMapper.xml
View file @
be8338f1
...
...
@@ -696,7 +696,7 @@
SELECT
a.id
FROM t_employee_contract_pre_new a
where a.process_status in('1','5' and (a.expected_collection_time
<![CDATA[ <= ]]>
now())
where a.process_status in('1','5'
)
and (a.expected_collection_time
<![CDATA[ <= ]]>
now())
</select>
<!--tEmployeeContractPreNew简单分页查询-->
...
...
@@ -710,7 +710,7 @@
b.emp_idcard,
b.emp_phone,
b.employee_nature,
b.pos
ition
,
b.pos
t as 'position'
,
b.customer_username,
b.customer_user_loginname,
b.sign_type,
...
...
@@ -811,6 +811,14 @@
#{id}
</foreach>
</if>
<if
test=
"tEmpContractAlert.preIdList != null and tEmpContractAlert.preIdList.size > 0"
>
AND b.id in
<foreach
item=
"preId"
index=
"index"
collection=
"tEmpContractAlert.preIdList"
open=
"("
separator=
","
close=
")"
>
#{preId}
</foreach>
</if>
</if>
<include
refid=
"tEmpContractAlert_where"
/>
</where>
...
...
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