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
90de898a
Commit
90de898a
authored
Mar 09, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同续签待办-fxj
parent
3929f27f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+1
-1
TEmpContractAlertMapper.xml
...biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
+2
-2
TEmployeeContractPreNewMapper.xml
...c/main/resources/mapper/TEmployeeContractPreNewMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
90de898a
...
@@ -1757,7 +1757,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -1757,7 +1757,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
@Override
@Override
public
R
<
List
<
TEmployeeContractPreNewDetailVo
>>
getDetailList
(
ContractAlertSearchVo
tEmployeeContractPreNew
)
{
public
R
<
List
<
TEmployeeContractPreNewDetailVo
>>
getDetailList
(
ContractAlertSearchVo
tEmployeeContractPreNew
)
{
//系统会自动拉取当前客服且“预计合同发起时间”为空的或为今日及今日之前的,续签状态为“待发起、发起失败、审核不通过、签署失败”的合同信息
//系统会自动拉取当前客服且“预计合同发起时间”为空的或为今日及今日之前的,续签状态为“待发起、发起失败、审核不通过、签署失败”的合同信息
//续签状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署
//续签状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署
11系统自动撤销
List
<
String
>
statusList
=
new
ArrayList
<>();
List
<
String
>
statusList
=
new
ArrayList
<>();
statusList
.
add
(
CommonConstants
.
ONE_STRING
);
statusList
.
add
(
CommonConstants
.
ONE_STRING
);
statusList
.
add
(
CommonConstants
.
FIVE_STRING
);
statusList
.
add
(
CommonConstants
.
FIVE_STRING
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
View file @
90de898a
...
@@ -191,7 +191,7 @@
...
@@ -191,7 +191,7 @@
AND a.ID = #{tEmpContractAlert.id}
AND a.ID = #{tEmpContractAlert.id}
</if>
</if>
<if
test=
"tEmpContractAlert.empName != null and tEmpContractAlert.empName.trim() != ''"
>
<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>
<if
test=
"tEmpContractAlert.empId != null and tEmpContractAlert.empId.trim() != ''"
>
<if
test=
"tEmpContractAlert.empId != null and tEmpContractAlert.empId.trim() != ''"
>
AND a.EMP_ID = #{tEmpContractAlert.empId}
AND a.EMP_ID = #{tEmpContractAlert.empId}
...
@@ -200,7 +200,7 @@
...
@@ -200,7 +200,7 @@
AND a.DEPT_ID = #{tEmpContractAlert.deptId}
AND a.DEPT_ID = #{tEmpContractAlert.deptId}
</if>
</if>
<if
test=
"tEmpContractAlert.project != null and tEmpContractAlert.project.trim() != ''"
>
<if
test=
"tEmpContractAlert.project != null and tEmpContractAlert.project.trim() != ''"
>
AND a.PROJECT
= #{tEmpContractAlert.project}
AND a.PROJECT
like concat('%', #{tEmpContractAlert.project}, '%')
</if>
</if>
<if
test=
"tEmpContractAlert.deptNoList != null and tEmpContractAlert.deptNoList.size > 0"
>
<if
test=
"tEmpContractAlert.deptNoList != null and tEmpContractAlert.deptNoList.size > 0"
>
AND a.PROJECT in
AND a.PROJECT in
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreNewMapper.xml
View file @
90de898a
...
@@ -710,7 +710,7 @@
...
@@ -710,7 +710,7 @@
b.emp_idcard,
b.emp_idcard,
b.emp_phone,
b.emp_phone,
b.employee_nature,
b.employee_nature,
b.pos
ition
,
b.pos
t as 'position'
,
b.customer_username,
b.customer_username,
b.customer_user_loginname,
b.customer_user_loginname,
b.sign_type,
b.sign_type,
...
...
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