Commit 29e5020b authored by hongguangwu's avatar hongguangwu

MVP1.7.12-导出

parent 3de0e596
...@@ -171,7 +171,8 @@ public class EmployeeExportVO extends BaseEntity { ...@@ -171,7 +171,8 @@ public class EmployeeExportVO extends BaseEntity {
* 人员档案来源(字典:4档案新增、5项目档案新建、1社保/公积金、3商险、2薪酬) * 人员档案来源(字典:4档案新增、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 档案新建、批量导入、社保/公积金派单、商险派单、人员发薪 * 档案新建、批量导入、社保/公积金派单、商险派单、人员发薪
*/ */
@ExcelAttribute(name = "人员档案来源", readConverterExp = "1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入,6=电子签,7=预入职") //@ExcelAttribute(name = "人员档案来源", readConverterExp = "1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入,6=电子签,7=预入职")
@ExcelAttribute(name = "人员档案来源", isDataId = true,dataType = ExcelAttributeConstants.EMP_SOURCE)
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "人员档案来源") @ExcelProperty(value = "人员档案来源")
private String fileSource; private String fileSource;
......
...@@ -239,7 +239,8 @@ public class EmployeeProjectExportVO { ...@@ -239,7 +239,8 @@ public class EmployeeProjectExportVO {
*/ */
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "人员档案来源") @ExcelProperty(value = "人员档案来源")
@ExcelAttribute(name = "人员档案来源", readConverterExp = "1=社保公积金,2=薪酬,3=商险,4=人员档案新建") //@ExcelAttribute(name = "人员档案来源", readConverterExp = "1=社保公积金,2=薪酬,3=商险,4=人员档案新建")
@ExcelAttribute(name = "人员档案来源", isDataId = true,dataType = ExcelAttributeConstants.EMP_SOURCE)
private String fileSource; private String fileSource;
/** /**
......
...@@ -123,6 +123,8 @@ public class ExcelAttributeConstants { ...@@ -123,6 +123,8 @@ public class ExcelAttributeConstants {
public static final String WORKINFO_TYPE = "workinfo_type"; public static final String WORKINFO_TYPE = "workinfo_type";
// 项目档案来源 // 项目档案来源
public static final String PROJECT_EMP_SOURCE = "project_emp_source"; public static final String PROJECT_EMP_SOURCE = "project_emp_source";
// 人员档案来源
public static final String EMP_SOURCE = "EMP_SOURCE";
//区域字段组合 //区域字段组合
public static final String DEPARTID_PROVINCE_CITY_TOWN = "departId_province_city_town"; public static final String DEPARTID_PROVINCE_CITY_TOWN = "departId_province_city_town";
......
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