bonus
/
SafetyAlertSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
mashuai 2024-09-30 15:02:22 +08:00
parent af149aa47e
commit 87363ec26b
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java
View File

@ -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;
/**
* 班组人数
*/

2
bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java
View File

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

10
bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectViewServiceImpl.java
View File

@ -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("未知岗位");
}