Commit 08ca9876 authored by hongguangwu's avatar hongguangwu

MVP1.7.12-瓜子导出档案_附属表

parent f3816fb4
...@@ -78,7 +78,7 @@ public class TGzEmpInfoExportMain implements Serializable { ...@@ -78,7 +78,7 @@ public class TGzEmpInfoExportMain implements Serializable {
private String bloodType; private String bloodType;
@ExcelProperty("首次工作日期") @ExcelProperty("首次工作日期")
@Schema(description = "首次工作日期") @Schema(description = "首次工作日期")
private Date startDate; private String startDate;
@ExcelAttribute(name = "国籍", isDataId = true, dataType = ExcelAttributeConstants.GZ_COUNTRY) @ExcelAttribute(name = "国籍", isDataId = true, dataType = ExcelAttributeConstants.GZ_COUNTRY)
@ExcelProperty("国籍") @ExcelProperty("国籍")
...@@ -130,10 +130,10 @@ public class TGzEmpInfoExportMain implements Serializable { ...@@ -130,10 +130,10 @@ public class TGzEmpInfoExportMain implements Serializable {
// 日期格式化 // 日期格式化
@ExcelProperty("证件有效期开始日期") @ExcelProperty("证件有效期开始日期")
private Date nidStartDate; private String nidStartDate;
// 日期格式化 // 日期格式化
@ExcelProperty("证件有效期结束日期") @ExcelProperty("证件有效期结束日期")
private Date nidExpiryDate; private String nidExpiryDate;
@ExcelAttribute(name = "是否永久有效", isDataId = true, readConverterExp = "Y=是,N=否") @ExcelAttribute(name = "是否永久有效", isDataId = true, readConverterExp = "Y=是,N=否")
@ExcelProperty("是否永久有效") @ExcelProperty("是否永久有效")
......
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
a.sex, a.sex,
a.constel, a.constel,
a.blood_type, a.blood_type,
a.start_date, date_format(a.start_date, '%Y-%m-%d') start_date,
a.country, a.country,
a.native_place, a.native_place,
a.ethnic_grp_cd, a.ethnic_grp_cd,
......
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