From 2462798066fcbe4ebbce42272f9e2246a412812c Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sun, 18 Aug 2024 16:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lihongjie/coal/employee/service/EmployeeService.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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<EmployeeEntity, EmployeeRepository> {
     public static final List<String> HEADERS =
             List.of(
-                    "姓名", "性别", "民族", "婚姻状况", "入职时间", "身份证号", "学历", "毕业学校", "籍贯", "住址", "手机号", "部门",
+                    "姓名", "性别", "民族","政治面貌", "婚姻状况", "入职时间", "身份证号", "学历", "毕业学校", "籍贯", "住址", "手机号", "部门",
                     "岗位", "银行卡号", "收款人姓名");
     @Autowired private EmployeeRepository repository;
 
@@ -156,6 +156,10 @@ public class EmployeeService extends BaseService<EmployeeEntity, EmployeeReposit
                                                 new ExcelUtils.ValidationInfo.ListValidationInfo(
                                                         dictionaryService.getExcelValidation(
                                                                 "sex"));
+                                        case "政治面貌" ->
+                                                new ExcelUtils.ValidationInfo.ListValidationInfo(
+                                                        dictionaryService.getExcelValidation(
+                                                                "emp.politicalStatus"));
                                         case "民族" ->
                                                 new ExcelUtils.ValidationInfo.ListValidationInfo(
                                                         dictionaryService.getExcelValidation(
@@ -217,6 +221,7 @@ public class EmployeeService extends BaseService<EmployeeEntity, EmployeeReposit
         var nationTranslator = translator.apply("nation");
         var marriageTranslator = translator.apply("marriage");
         var educationTranslator = translator.apply("education");
+        var politicalStatusTranslator = translator.apply("emp.politicalStatus");
 
         List<EmployeeEntity> list =
                 ExcelUtils.readFirstSheetToObjectList(
@@ -228,6 +233,8 @@ public class EmployeeService extends BaseService<EmployeeEntity, EmployeeReposit
                                 case "性别" -> 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));