Commit c9952f47 authored by fangxinjiang's avatar fangxinjiang

导入导出优化

parent 3631d97c
...@@ -109,7 +109,7 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T ...@@ -109,7 +109,7 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
} }
// 数据合法情况 // 数据合法情况
insertExcel(excel,emp); insertExcel(excel,emp);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
} }
} }
......
package com.yifu.cloud.plus.v1.yifu.social.vo; package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -36,8 +37,8 @@ public class FundHandleExportVo implements Serializable { ...@@ -36,8 +37,8 @@ public class FundHandleExportVo implements Serializable {
/** /**
* 员工身份证 * 员工身份证
*/ */
@ExcelAttribute(name = "员工身份证", errorInfo = "员工身份证不能为空", maxLength = 20,needExport = true) @ExcelAttribute(name = "身份证号", errorInfo = "身份证号不能为空", maxLength = 20,needExport = true)
@ExcelProperty("员工身份证" ) @ExcelProperty("身份证号" )
private String empIdcard; private String empIdcard;
/** /**
* 所属单位 * 所属单位
...@@ -89,6 +90,7 @@ public class FundHandleExportVo implements Serializable { ...@@ -89,6 +90,7 @@ public class FundHandleExportVo implements Serializable {
/** /**
* 公积金起缴日期 * 公积金起缴日期
*/ */
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "公积金起缴日期", errorInfo = "公积金起缴日期不能为空",needExport = true) @ExcelAttribute(name = "公积金起缴日期", errorInfo = "公积金起缴日期不能为空",needExport = true)
@ExcelProperty("公积金起缴日期" ) @ExcelProperty("公积金起缴日期" )
private LocalDateTime providentStart; private LocalDateTime providentStart;
......
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