From f83691d579c70fe759ad31b49c2365e4d0f82bde Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 25 May 2022 17:18:18 +0800 Subject: [PATCH] =?UTF-8?q?bug53095=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProjectRelatedPersonnel.java | 57 +------------ .../ProjectRelatedPersonnelServiceImpl.java | 84 ++++++------------- 2 files changed, 28 insertions(+), 113 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index 98dcaa01f..4b6f6c130 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -15,6 +15,7 @@ import org.jeecgframework.poi.excel.annotation.ExcelTarget; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.List; /** @@ -60,7 +61,8 @@ public class ProjectRelatedPersonnel implements Serializable { @TableField(exist = false) @Excel(name = "认证工程师,Homologation Engineer", width = 15,orderNum = "4") private java.lang.String certificationEngineerName; - + @TableField(exist = false) + private List certificationEngineerNameList; /**备注*/ @Excel(name = "备注,Comments", width = 15,orderNum = "5") private java.lang.String remark; @@ -88,55 +90,4 @@ public class ProjectRelatedPersonnel implements Serializable { /**中英切换标志*/ @TableField(exist = false) private String cut; -} - /* *//**责任领域*//* - @Excel(name = "责任领域,Responsible Field", width = 15,orderNum = "1",dicCode = "duty_territory") - @Dict(dicCode = "duty_territory") - private java.lang.String dutyTerritory; - - *//**法规工程师*//* - private java.lang.String lawEngineer; - @TableField(exist = false) - @Excel(name = "法规工程师,Regulation Engineer", width = 15,orderNum = "2") - private java.lang.String lawEngineerName; - - *//**工程接口人*//* - private java.lang.String engineeringInterfacePerson; - @TableField(exist = false) - @Excel(name = "工程接口人,Engineering Interface", width = 15,orderNum = "3") - private java.lang.String engineeringInterfacePersonName; - - *//**认证工程师*//* - private java.lang.String certificationEngineer; - @TableField(exist = false) - @Excel(name = "认证工程师,Homologation Engineer", width = 15,orderNum = "4") - private java.lang.String certificationEngineerName; - - *//**备注*//* - @Excel(name = "备注,Comments", width = 15,orderNum = "5") - private java.lang.String remark; - - *//**创建人*//* - private java.lang.String createBy; - - *//**创建日期*//* - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date createTime; - - *//**更新人*//* - private java.lang.String updateBy; - - *//**更新日期*//* - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date updateTime; - - *//**所属部门*//* - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - - *//**中英切换标志*//* - @TableField(exist = false) - private String cut; -}*/ +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9d1c62ef2..2039f36fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -996,79 +996,43 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records) { -//// List records = projectRelatedPersonnelMapper.queryById(projectRelatedPersonnel.getId()); -// for (ProjectRelatedPersonnel projectRelatedPersonnel : records) { -//// //法规工程师 -//// String lawString = projectRelatedPersonnel.getLawEngineer(); -//// //去重 -//// if(StringUtils.isNotBlank(lawString)) { -//// List lawList = Arrays.asList(lawString.split(",")); -//// String lawDistinct = lawList.stream().distinct().collect(Collectors.joining(",")); -//// projectRelatedPersonnel.setLawEngineer(lawDistinct); -//// } -//// -//// //工程接口人 -//// String interfaceString = projectRelatedPersonnel.getEngineeringInterfacePerson(); -//// //去重 -//// if(StringUtils.isNotBlank(interfaceString)) { -//// List interfaceList = Arrays.asList(interfaceString.split(",")); -//// String interfaceDistinct = interfaceList.stream().distinct().collect(Collectors.joining(",")); -//// projectRelatedPersonnel.setEngineeringInterfacePerson(interfaceDistinct); -//// } -//// -////// 工程接口人 -//// String certificationString = projectRelatedPersonnel.getCertificationEngineer(); -//// //去重 -//// if(StringUtils.isNotBlank(certificationString)) { -//// List certificationList = Arrays.asList(certificationString.split(",")); -//// String certificationDistinct = certificationList.stream().distinct().collect(Collectors.joining(",")); -//// projectRelatedPersonnel.setCertificationEngineer(certificationDistinct); -//// } -//// -//// if (StringUtils.isBlank(data.getRemark())) {//数据库里备注是空的 -//// projectRelatedPersonnel.setRemark(projectRelatedPersonnel.getRemark()); -//// } else { -//// projectRelatedPersonnel.setRemark(""); -//// } -// -// Date now = new Date(); -// projectRelatedPersonnel.setUpdateTime(now); -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// projectRelatedPersonnel.setUpdateBy(sysUser.getUsername()); -// updateById(projectRelatedPersonnel); -// } -// } - @Override public List queryCertificationEngineer(String projectId) { + //查询数据库中的数据 QueryWrapper queryWrapper = new QueryWrapper<>(); - List list = list(queryWrapper.eq("project_id",projectId)); - + List list = list(queryWrapper.eq("project_id", projectId)); + List certificationEngineerList = new ArrayList<>(); //查询基础表认证工程师的值 QueryWrapper baseQueryWrapper = new QueryWrapper<>(); List baseDataList = projectLibraryBaseService.list(baseQueryWrapper.eq("id", projectId)); - String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer(); + if (CollectionUtils.isNotEmpty(baseDataList)) { + String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer(); + List baseCertificationEngineerIdList = Arrays.asList(baseCertificationEngineer.split(",")); + String certificationEngineerName; + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", baseCertificationEngineerIdList); + List userList = sysUserMapper.selectList(userqueryWrapper); + if (CollectionUtils.isNotEmpty(userList)) { + for (String baseUserId : baseCertificationEngineerIdList) { - if(StringUtils.isNotBlank(baseCertificationEngineer)) { - for (ProjectRelatedPersonnel projectRelatedPersonnel : list) { - projectRelatedPersonnel.setCertificationEngineer(baseCertificationEngineer); + if (StringUtils.isNotEmpty(baseUserId)) { + certificationEngineerName = userList.stream().filter(e -> baseUserId.equals(e.getId())) + .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel(); + relatedPersonnel.setCertificationEngineer(baseUserId); + relatedPersonnel.setCertificationEngineerName(certificationEngineerName); + certificationEngineerList.add(relatedPersonnel); + } + + } } } - disposeData(list); - List certificationEngineerList = new ArrayList<>(); - for(ProjectRelatedPersonnel personnel : list){ - ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel(); - relatedPersonnel.setCertificationEngineer(personnel.getCertificationEngineer()); - relatedPersonnel.setCertificationEngineerName(personnel.getCertificationEngineerName()); - certificationEngineerList.add(relatedPersonnel); - } + certificationEngineerList = certificationEngineerList.stream().distinct().collect(Collectors.toList()); return certificationEngineerList; + } - }