Commit c6ed0b78 authored by hongguangwu's avatar hongguangwu

MVP1.7.16-导出

parent 90d95685
......@@ -299,4 +299,9 @@ public class EmployeeContractExportVO implements Serializable {
@Schema(description = "试用期", name = "tryPeriod")
@ExcelProperty("试用期")
private String tryPeriod;
@Schema(description = "签署方式1线下签0电子签")
@ExcelProperty("签署方式")
@ExcelAttribute(name = "签署方式", readConverterExp = "0=电子签,1=线下签")
private String signType;
}
......@@ -145,6 +145,7 @@
<result property="remark" column="REMARK"/>
<result property="memo" column="MEMO"/>
<result property="tryPeriod" column="TRY_PERIOD"/>
<result property="signType" column="sign_type"/>
</resultMap>
<sql id="Base_Column_List">
......@@ -536,7 +537,8 @@
b.REMARK,
a.REMARK as memo,
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
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
......@@ -619,7 +621,8 @@
min(a.CONTRACT_START) START_DATE,
max(a.CONTRACT_END) END_DATE,
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
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
......
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