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
c6ed0b78
Commit
c6ed0b78
authored
Nov 03, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.16-导出
parent
90d95685
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
EmployeeContractExportVO.java
...ud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java
+5
-0
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+5
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java
View file @
c6ed0b78
...
@@ -299,4 +299,9 @@ public class EmployeeContractExportVO implements Serializable {
...
@@ -299,4 +299,9 @@ public class EmployeeContractExportVO implements Serializable {
@Schema
(
description
=
"试用期"
,
name
=
"tryPeriod"
)
@Schema
(
description
=
"试用期"
,
name
=
"tryPeriod"
)
@ExcelProperty
(
"试用期"
)
@ExcelProperty
(
"试用期"
)
private
String
tryPeriod
;
private
String
tryPeriod
;
@Schema
(
description
=
"签署方式1线下签0电子签"
)
@ExcelProperty
(
"签署方式"
)
@ExcelAttribute
(
name
=
"签署方式"
,
readConverterExp
=
"0=电子签,1=线下签"
)
private
String
signType
;
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
c6ed0b78
...
@@ -145,6 +145,7 @@
...
@@ -145,6 +145,7 @@
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"memo"
column=
"MEMO"
/>
<result
property=
"memo"
column=
"MEMO"
/>
<result
property=
"tryPeriod"
column=
"TRY_PERIOD"
/>
<result
property=
"tryPeriod"
column=
"TRY_PERIOD"
/>
<result
property=
"signType"
column=
"sign_type"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -536,7 +537,8 @@
...
@@ -536,7 +537,8 @@
b.REMARK,
b.REMARK,
a.REMARK as memo,
a.REMARK as memo,
a.CREATE_TIME,
a.CREATE_TIME,
a.TRY_PERIOD
a.TRY_PERIOD,
if(a.sign_type is not null, if(a.sign_type = 0,'电子签','线下签'),'') sign_type
FROM t_employee_contract_info a
FROM t_employee_contract_info a
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
...
@@ -619,7 +621,8 @@
...
@@ -619,7 +621,8 @@
min(a.CONTRACT_START) START_DATE,
min(a.CONTRACT_START) START_DATE,
max(a.CONTRACT_END) END_DATE,
max(a.CONTRACT_END) END_DATE,
GROUP_CONCAT(concat(a.CONTRACT_START,'~',ifnull(a.CONTRACT_END,'')) ORDER BY a.CONTRACT_START asc) HISTORY,
GROUP_CONCAT(concat(a.CONTRACT_START,'~',ifnull(a.CONTRACT_END,'')) ORDER BY a.CONTRACT_START asc) HISTORY,
a.TRY_PERIOD
a.TRY_PERIOD,
if(a.sign_type is not null, if(a.sign_type = 0,'电子签','线下签'),'') sign_type
FROM t_employee_contract_info a
FROM t_employee_contract_info a
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
...
...
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