From 9338254ccaf1aabc7827f555b25aeb122d229df9 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 30 Sep 2024 10:38:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/screen/mapper/TeamRecordMapper.java | 2 +- .../service/impl/ProjectViewServiceImpl.java | 46 +++++++++++++++---- .../java/com/bonus/screen/vo/TeamRecord.java | 8 ++++ .../mapper/screen/TeamRecordMapper.xml | 29 +++++++++--- 4 files changed, 70 insertions(+), 15 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java index c49d6f9..ef6b070 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TeamRecordMapper.java @@ -32,7 +32,7 @@ public interface TeamRecordMapper { List getTeamPeopleDetails(TeamRecord record); /** - * 施工人员-班组骨干详情页 + * 施工人员-班组骨干、一般作业、特种作业详情页 * @param record * @return */ 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 33e8386..5ddba9c 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 @@ -23,6 +23,8 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; +import static com.bonus.base.config.Constants.*; + /** * @author : 阮世耀 * @version : 1.0 @@ -219,12 +221,13 @@ public class ProjectViewServiceImpl { public List getTeamDetails(TeamRecord record) { List list = new ArrayList<>(); list = teamRecord.getTeamDetails(record); - if(CollectionUtils.isNotEmpty(list)) + if(CollectionUtils.isNotEmpty(list)) { list.forEach(teamRecordOne -> { if (StringUtils.isNotBlank(teamRecordOne.getMasterPhone())) { teamRecordOne.setMasterPhone(Sm4Utils.decode(teamRecordOne.getMasterPhone())); } }); + } return list; } @@ -236,29 +239,55 @@ public class ProjectViewServiceImpl { public List getTeamPeopleDetails(TeamRecord record) { List list = new ArrayList<>(); list = teamRecord.getTeamPeopleDetails(record); - if(CollectionUtils.isNotEmpty(list)) - list.forEach(teamRecordOne -> { - if (StringUtils.isNotBlank(teamRecordOne.getPhone())) { - teamRecordOne.setPhone(Sm4Utils.decode(teamRecordOne.getPhone())); + if(CollectionUtils.isNotEmpty(list)) { + list.forEach(people -> { + if (StringUtils.isNotBlank(people.getPhone())) { + people.setPhone(Sm4Utils.decode(people.getPhone())); } + extracted(people); }); + } return list; } /** - * 施工人员-班组骨干详情页 + * 归一方法抽取 + * @param people + */ + private void extracted(TeamRecord people) { + if (StringUtils.isNotBlank(people.getPostCode())) { + if (TEAM_LEADER.equals(people.getPostCode())){ + people.setPeopleName("班组负责人"); + } else if (TEAM_SAFETY.equals(people.getPostCode())){ + people.setPeopleName("班组安全员"); + } else if (TEAM_TECHNICAL.equals(people.getPostCode())){ + people.setPeopleName("班组技术员"); + } else if (SPECIALIZED_WORKER.equals(people.getPostCode())){ + people.setPeopleName("特种作业人员"); + } else if (REGULAR_WORKER.equals(people.getPostCode())) { + people.setPeopleName("一般作业人员"); + } else { + people.setPeopleName("未知岗位"); + } + } + } + + /** + * 施工人员-班组骨干、一般作业、特种作业详情页 * @param record * @return */ public List getTeamMasterDetails(TeamRecord record) { List list = new ArrayList<>(); list = teamRecord.getTeamMasterDetails(record); - if(CollectionUtils.isNotEmpty(list)) + if(CollectionUtils.isNotEmpty(list)) { list.forEach(teamRecordOne -> { if (StringUtils.isNotBlank(teamRecordOne.getPhone())) { teamRecordOne.setPhone(Sm4Utils.decode(teamRecordOne.getPhone())); } + extracted(teamRecordOne); }); + } return list; } @@ -270,12 +299,13 @@ public class ProjectViewServiceImpl { public List getUserPostDetails(UserPost record) { List list = new ArrayList<>(); list = userPost.getUserPostDetails(record); - if(CollectionUtils.isNotEmpty(list)) + if(CollectionUtils.isNotEmpty(list)) { list.forEach(userPostOne -> { if (StringUtils.isNotBlank(userPostOne.getPhone())) { userPostOne.setPhone(Sm4Utils.decode(userPostOne.getPhone())); } }); + } return list; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java index 44caf82..84f3329 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/vo/TeamRecord.java @@ -13,6 +13,8 @@ import java.io.Serializable; @Data public class TeamRecord implements Serializable { + private Integer isFlag; + /** * 班组id */ @@ -50,6 +52,12 @@ public class TeamRecord implements Serializable { @ApiModelProperty(value="岗位工种") private String postCode; + /** + * 岗位工种名称 + */ + @ApiModelProperty(value="岗位工种名称") + private String postCodeName; + /** * 班组长电话 */ diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml index e4e48ee..540eb7e 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TeamRecordMapper.xml @@ -30,8 +30,11 @@ tt.rel_phone as masterPhone, count(tp.id) as peopleCount from tb_team tt - left join tb_people tp on tt.id = tp.team_id and tp.del_flag = 0 + left join tb_people tp on tt.id = tp.team_id and tp.del_flag = 0 and tt.js_time IS NULL where tt.del_flag = 0 + + AND tt.pro_id = #{proId} + and tt.team_name like concat('%',#{teamName},'%') @@ -51,8 +54,11 @@ tp.rel_phone as phone, tp.post_code as postCode from tb_people tp - left join tb_team tt on tp.team_id = tt.id and tt.del_flag = 0 + left join tb_team tt on tp.team_id = tt.id and tt.del_flag = 0 and tt.js_time IS NULL where tp.del_flag = 0 + + AND tt.pro_id = #{proId} + and tp.rel_name like concat('%',#{peopleName},'%') @@ -61,7 +67,7 @@ - +