Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
ea1ceb01
Commit
ea1ceb01
authored
Jun 10, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.24 - 勾选导出
parent
5e5e9fc1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
0 deletions
+39
-0
EmployeeContractExportAuditVO.java
...us/v1/yifu/archives/vo/EmployeeContractExportAuditVO.java
+10
-0
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+2
-0
TDispatchAuditExportVo.java
.../cloud/plus/v1/yifu/social/vo/TDispatchAuditExportVo.java
+23
-0
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+4
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportAuditVO.java
View file @
ea1ceb01
...
...
@@ -133,6 +133,16 @@ public class EmployeeContractExportAuditVO implements Serializable {
@Schema
(
description
=
"合同截止时间"
,
name
=
"contractEnd"
)
private
String
contractEnd
;
/**
* 岗位名称
*/
@Length
(
max
=
32
,
message
=
"岗位名称不能超过32个字符"
)
@ExcelAttribute
(
name
=
"岗位名称"
,
maxLength
=
32
,
needExport
=
true
)
@Schema
(
description
=
"岗位名称"
,
name
=
"post"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"岗位名称"
)
private
String
post
;
/**
* 签订期限employee_contract_type
* 0 已完成一定工作任务为期限
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
ea1ceb01
...
...
@@ -95,6 +95,7 @@
<result
property=
"contractName"
column=
"CONTRACT_NAME"
/>
<result
property=
"contractType"
column=
"CONTRACT_TYPE"
/>
<result
property=
"contractEnd"
column=
"CONTRACT_END"
/>
<result
property=
"post"
column=
"POST"
/>
<result
property=
"subjectDepart"
column=
"SUBJECT_DEPART"
/>
<result
property=
"subjectUnit"
column=
"SUBJECT_UNIT"
/>
<result
property=
"situation"
column=
"SITUATION"
/>
...
...
@@ -675,6 +676,7 @@
a.CONTRACT_TYPE,
a.CONTRACT_START,
a.CONTRACT_END,
a.POST,
a.SUBJECT_DEPART,
a.SUBJECT_UNIT,
a.SITUATION,
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchAuditExportVo.java
View file @
ea1ceb01
...
...
@@ -149,6 +149,29 @@ public class TDispatchAuditExportVo {
@ExcelProperty
(
"合同到期时间"
)
private
Date
contractEnd
;
/**
* 签订期限类型
* 0 已完成一定工作任务为期限
* 1 固定期限
* 2 无固定期限
*/
@Length
(
max
=
32
,
message
=
"签订期限类型不能超过32个字符"
)
@ExcelAttribute
(
name
=
"签订期限类型"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_CONTRACT_TYPE
)
@Schema
(
description
=
"签订期限类型"
,
name
=
"contractType"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"签订期限类型"
)
private
String
contractType
;
/**
* 岗位名称
*/
@Length
(
max
=
30
,
message
=
"岗位名称不能超过30个字符"
)
@ExcelAttribute
(
name
=
"岗位名称"
,
maxLength
=
30
)
@Schema
(
description
=
"岗位名称"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"岗位名称"
)
private
String
post
;
/**
* 工时制:1标准工时 2 综合工时 3不定时工时制
*/
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
ea1ceb01
...
...
@@ -336,6 +336,8 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"contractStart"
column=
"CONTRACT_START"
/>
<result
property=
"contractEnd"
column=
"CONTRACT_END"
/>
<result
property=
"contractType"
column=
"CONTRACT_TYPE"
/>
<result
property=
"post"
column=
"POST"
/>
<result
property=
"trustRemark"
column=
"TRUST_REMARK"
/>
<result
property=
"contractName"
column=
"CONTRACT_NAME"
/>
<result
property=
"workingHours"
column=
"WORKING_HOURS"
/>
...
...
@@ -1064,6 +1066,8 @@
a.CREATE_TIME,
a.CONTRACT_START,
a.CONTRACT_END,
a.CONTRACT_TYPE,
a.POST,
a.TRUST_REMARK,
a.CONTRACT_NAME,
a.WORKING_HOURS,
...
...
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