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
e7f1ad17
Commit
e7f1ad17
authored
Oct 21, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
29435f37
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
TEmployeeContractPreExportVo.java
...lus/v1/yifu/archives/vo/TEmployeeContractPreExportVo.java
+5
-0
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+8
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreExportVo.java
View file @
e7f1ad17
...
...
@@ -99,4 +99,9 @@ public class TEmployeeContractPreExportVo implements Serializable {
@Schema
(
description
=
"状态"
)
@ExcelProperty
(
"状态"
)
private
String
processStatus
;
@ExcelAttribute
(
name
=
"是否已建档"
)
@Schema
(
description
=
"是否已建档"
)
@ExcelProperty
(
"是否已建档"
)
private
String
archivesIsCreate
;
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
e7f1ad17
...
...
@@ -175,7 +175,7 @@
,TASK_TYPE
,TASK_END_STANDARD,contract_flag,a.CONTRACT_SUB_NAME
,a.request_id
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
,a.archives_is_create
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
</sql>
<sql
id=
"tEmployeeContractPre_where"
>
<if
test=
"tEmployeeContractPre != null"
>
...
...
@@ -276,7 +276,10 @@
<select
id=
"getTEmployeeContractPrePage"
resultMap=
"tEmployeeContractPreMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
,if(b.id is null,'1','0') archives_is_create
FROM t_employee_contract_pre a
left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0'
<where>
1=1
<include
refid=
"tEmployeeContractPre_where"
/>
...
...
@@ -334,8 +337,11 @@
WHEN a.process_status =6 THEN "签署中"
WHEN a.process_status =7 THEN "签署失败"
WHEN a.process_status =8 THEN "电子待归档"
ELSE a.process_status END as process_status
ELSE a.process_status END as process_status,
if(b.id is null,'否','是') archives_is_create
FROM t_employee_contract_pre a
left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0'
<where>
1=1
<include
refid=
"tEmployeeContractPre_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