mom-pro2-after.git

			@@ -4,6 +4,7 @@
			import cn.idev.excel.annotation.ExcelProperty;
			import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
			import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
			import cn.iocoder.yudao.module.system.api.storage.dto.StorageBlobRespDTO;
			import io.swagger.v3.oas.annotations.media.Schema;
			import lombok.Data;

			@@ -32,12 +33,12 @@
			@ExcelProperty("部门名称")
			private String deptName;

			@Schema(description = "岗位ID")
			private Long postId;
			@Schema(description = "岗位ID列表")
			private List<Long> postIds;

			@Schema(description = "岗位名称")
			@Schema(description = "岗位名称列表")
			@ExcelProperty("岗位名称")
			private String postName;
			private String postNames;

			@Schema(description = "员工姓名")
			@ExcelProperty("员工姓名")
			@@ -64,6 +65,26 @@
			@ExcelProperty("身份证号")
			private String idCard;

			@Schema(description = "民族")
			@ExcelProperty("民族")
			private String nation;

			@Schema(description = "婚姻状态")
			@ExcelProperty("婚姻状态")
			private String marriageStatus;

			@Schema(description = "年龄")
			@ExcelProperty("年龄")
			private Integer age;

			@Schema(description = "学历")
			@ExcelProperty("学历")
			private String education;

			@Schema(description = "政治面貌")
			@ExcelProperty("政治面貌")
			private String politicalStatus;

			@Schema(description = "入职日期")
			@ExcelProperty("入职日期")
			private LocalDate hireDate;
			@@ -80,6 +101,11 @@
			@ExcelProperty(value = "员工状态", converter = DictConvert.class)
			@DictFormat("hrm_employee_status")
			private Integer employeeStatus;

			@Schema(description = "员工类别")
			@ExcelProperty(value = "员工类别", converter = DictConvert.class)
			@DictFormat("hrm_employee_category")
			private Integer employeeCategory;

			@Schema(description = "年假余额（天）")
			@ExcelProperty("年假余额")
			@@ -123,4 +149,7 @@
			@ExcelProperty("创建时间")
			private LocalDateTime createTime;

			@Schema(description = "附件列表")
			private List<StorageBlobRespDTO> attachmentList;

			}