Commit b080e1b9 authored by hongguangwu's avatar hongguangwu

项目档案的Integer换成String,以便导出

parent 2e8bc50a
...@@ -219,7 +219,7 @@ public class EmployeeProjectExportVO{ ...@@ -219,7 +219,7 @@ public class EmployeeProjectExportVO{
*/ */
@ExcelProperty(value = "人员档案状态") @ExcelProperty(value = "人员档案状态")
@ExcelAttribute(name = "人员档案状态", readConverterExp = "0=草稿,1=已审核") @ExcelAttribute(name = "人员档案状态", readConverterExp = "0=草稿,1=已审核")
private Integer proStatus; private String proStatus;
/** /**
* 创建者-姓名 * 创建者-姓名
...@@ -329,7 +329,7 @@ public class EmployeeProjectExportVO{ ...@@ -329,7 +329,7 @@ public class EmployeeProjectExportVO{
*/ */
@ExcelProperty(value ="合同状态") @ExcelProperty(value ="合同状态")
@ExcelAttribute(name = "合同状态", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_STATE) @ExcelAttribute(name = "合同状态", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_STATE)
private Integer contractStatus; private String contractStatus;
/** /**
* 业务类型一级分类 * 业务类型一级分类
...@@ -354,28 +354,28 @@ public class EmployeeProjectExportVO{ ...@@ -354,28 +354,28 @@ public class EmployeeProjectExportVO{
*/ */
@ExcelProperty(value ="商险状态") @ExcelProperty(value ="商险状态")
@ExcelAttribute(name = "商险状态", isDataId = true,dataType = ExcelAttributeConstants.COMMERCIAL_SATTE) @ExcelAttribute(name = "商险状态", isDataId = true,dataType = ExcelAttributeConstants.COMMERCIAL_SATTE)
private Integer insuranceStatus; private String insuranceStatus;
/** /**
* 社保状态(字典) * 社保状态(字典)
*/ */
@ExcelProperty(value ="社保状态") @ExcelProperty(value ="社保状态")
@ExcelAttribute(name = "社保状态", isDataId = true,dataType = ExcelAttributeConstants.SOCIAL_ECURITY_STATE) @ExcelAttribute(name = "社保状态", isDataId = true,dataType = ExcelAttributeConstants.SOCIAL_ECURITY_STATE)
private Integer socialStatus; private String socialStatus;
/** /**
* 公积金状态(字典) * 公积金状态(字典)
*/ */
@ExcelProperty(value ="公积金状态") @ExcelProperty(value ="公积金状态")
@ExcelAttribute(name = "公积金状态", isDataId = true,dataType = ExcelAttributeConstants.FUND_STATUS) @ExcelAttribute(name = "公积金状态", isDataId = true,dataType = ExcelAttributeConstants.FUND_STATUS)
private Integer fundStatus; private String fundStatus;
/** /**
* 近3个月发薪(0否;1是) * 近3个月发薪(0否;1是)
*/ */
@ExcelProperty(value ="近3个月发薪") @ExcelProperty(value ="近3个月发薪")
@ExcelAttribute(name = "近3个月发薪", readConverterExp = "0=无,1=是,2=否") @ExcelAttribute(name = "近3个月发薪", readConverterExp = "0=无,1=是,2=否")
private Integer salaryStatus; private String salaryStatus;
/** /**
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬) * 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
...@@ -389,7 +389,7 @@ public class EmployeeProjectExportVO{ ...@@ -389,7 +389,7 @@ public class EmployeeProjectExportVO{
*/ */
@ExcelAttribute(name ="项目档案状态", readConverterExp = "0=草稿,1=已审核") @ExcelAttribute(name ="项目档案状态", readConverterExp = "0=草稿,1=已审核")
@ExcelProperty(value ="项目档案状态") @ExcelProperty(value ="项目档案状态")
private Integer status; private String status;
/** /**
* 项目档案创建人 * 项目档案创建人
......
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