diff --git a/src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java b/src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java index b5cc8865..d441c649 100644 --- a/src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java +++ b/src/main/java/cn/lihongjie/coal/employee/service/EmployeeService.java @@ -50,7 +50,7 @@ import java.util.stream.Collectors; public class EmployeeService extends BaseService { public static final List HEADERS = List.of( - "姓名", "性别", "民族", "婚姻状况", "入职时间", "身份证号", "学历", "毕业学校", "籍贯", "住址", "手机号", "部门", + "姓名", "性别", "民族","政治面貌", "婚姻状况", "入职时间", "身份证号", "学历", "毕业学校", "籍贯", "住址", "手机号", "部门", "岗位", "银行卡号", "收款人姓名"); @Autowired private EmployeeRepository repository; @@ -156,6 +156,10 @@ public class EmployeeService extends BaseService + new ExcelUtils.ValidationInfo.ListValidationInfo( + dictionaryService.getExcelValidation( + "emp.politicalStatus")); case "民族" -> new ExcelUtils.ValidationInfo.ListValidationInfo( dictionaryService.getExcelValidation( @@ -217,6 +221,7 @@ public class EmployeeService extends BaseService list = ExcelUtils.readFirstSheetToObjectList( @@ -228,6 +233,8 @@ public class EmployeeService extends BaseService emp.setSex(ExcelUtils.getCode(value, sexTranslator)); case "民族" -> emp.setNation(ExcelUtils.getCode(value, nationTranslator)); + case "政治面貌" -> + emp.setNation(ExcelUtils.getCode(value, politicalStatusTranslator)); case "婚姻状况" -> emp.setMarriage( ExcelUtils.getCode(value, marriageTranslator));