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)); }