From 862d54eaabd7f319e4d0edc19b028d230c8b2937 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sun, 29 Sep 2024 13:24:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=88=AC=E4=BD=9C=E4=B8=9A=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=B2=97=E4=BD=8D=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bonus/base/config/Constants.java | 5 +++++ .../java/com/bonus/base/controller/TbPeopleController.java | 7 +++---- .../com/bonus/base/service/impl/TbPeopleServiceImpl.java | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/Constants.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/Constants.java index 00f6314..d81a6b7 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/Constants.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/config/Constants.java @@ -22,6 +22,11 @@ public class Constants { */ public static final String TEAM_TECHNICAL = "0900103"; + /** + * 一般作业人员 + */ + public static final String REGULAR_WORKER = "0900104"; + /** * 特种作业人员 */ diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbPeopleController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbPeopleController.java index 5de6fa8..810e5ec 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbPeopleController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbPeopleController.java @@ -17,10 +17,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; -import static com.bonus.base.config.Constants.TEAM_LEADER; -import static com.bonus.base.config.Constants.TEAM_SAFETY; -import static com.bonus.base.config.Constants.TEAM_TECHNICAL; -import static com.bonus.base.config.Constants.SPECIALIZED_WORKER; +import static com.bonus.base.config.Constants.*; /** * 人员管理(TbPeople)表控制层 @@ -121,6 +118,8 @@ public class TbPeopleController extends BaseController { people.setPostCode("班组技术员"); } else if (SPECIALIZED_WORKER.equals(people.getPostCode())){ people.setPostCode("特种作业人员"); + } else if (REGULAR_WORKER.equals(people.getPostCode())) { + people.setPostCode("一般作业人员"); } else { people.setPostCode("未知岗位"); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java index 72771ea..7d68ccb 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbPeopleServiceImpl.java @@ -408,7 +408,7 @@ public class TbPeopleServiceImpl implements TbPeopleService { */ private void checkPostCode(String cellValue, int rowIndex, int colIndex) { if (!Constants.TEAM_LEADER.equals(cellValue) && !Constants.TEAM_SAFETY.equals(cellValue) && !Constants.TEAM_TECHNICAL.equals(cellValue) - && !Constants.SPECIALIZED_WORKER.equals(cellValue)) { + && !Constants.REGULAR_WORKER.equals(cellValue) && !Constants.SPECIALIZED_WORKER.equals(cellValue)) { throw new IllegalArgumentException( String.format("第 %d 行，第 %d 列岗位编码格式不正确，请检查后重新导入", rowIndex + 1, colIndex + 1)); }