Commit ea1ceb01 authored by hongguangwu's avatar hongguangwu

1.7.24 - 勾选导出

parent 5e5e9fc1
......@@ -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 已完成一定工作任务为期限
......
......@@ -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,
......
......@@ -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不定时工时制
*/
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment