From 87363ec26b8135488824ea649abf3e16ecdcee91 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 30 Sep 2024 15:02:22 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bonus/base/domain/TbTeam.java | 8 +++++++- .../com/bonus/base/service/impl/TbTeamServiceImpl.java | 2 +- .../screen/service/impl/ProjectViewServiceImpl.java | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java index c3d7cf0..e65f5a2 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java @@ -61,10 +61,16 @@ public class TbTeam implements Serializable { /** * 班组长名称2 */ - @Excel(name = "班组长") @Size(max = 50,message = "班组长最大长度要小于 50") private String relName; + /** + * 班组长名称2 + */ + @Excel(name = "班组长") + @Size(max = 50,message = "班组长最大长度要小于 50") + private String relNamePhone; + /** * 班组人数 */ diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java index 2625e91..6425fb3 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java @@ -91,7 +91,7 @@ public class TbTeamServiceImpl implements TbTeamService { if (StringUtils.isNotBlank(team.getRelName()) && StringUtils.isNotBlank(team.getRelPhone())) { // 解密 relPhone，并拼接到 relName 后面 String decodedPhone = Sm4Utils.decode(team.getRelPhone()); - team.setRelName(team.getRelName() + "/" + decodedPhone); + team.setRelNamePhone(team.getRelName() + "/" + decodedPhone); } } } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java index 5ddba9c..c5cfdf9 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java @@ -257,15 +257,15 @@ public class ProjectViewServiceImpl { private void extracted(TeamRecord people) { if (StringUtils.isNotBlank(people.getPostCode())) { if (TEAM_LEADER.equals(people.getPostCode())){ - people.setPeopleName("班组负责人"); + people.setPostCodeName("班组负责人"); } else if (TEAM_SAFETY.equals(people.getPostCode())){ - people.setPeopleName("班组安全员"); + people.setPostCodeName("班组安全员"); } else if (TEAM_TECHNICAL.equals(people.getPostCode())){ - people.setPeopleName("班组技术员"); + people.setPostCodeName("班组技术员"); } else if (SPECIALIZED_WORKER.equals(people.getPostCode())){ - people.setPeopleName("特种作业人员"); + people.setPostCodeName("特种作业人员"); } else if (REGULAR_WORKER.equals(people.getPostCode())) { - people.setPeopleName("一般作业人员"); + people.setPostCodeName("一般作业人员"); } else { people.setPeopleName("未知岗位"); }