From 8206541894a493ccda3056499ff19abcf127ca13 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 27 Apr 2022 16:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BA=BA=E5=91=98-=E5=AF=BC=E5=85=A5=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E5=8E=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/jero-boot-modules/pom.xml | 5 ++ .../entity/ProjectRelatedPersonnel.java | 8 +- .../ProjectRelatedPersonnelServiceImpl.java | 76 ++++++------------- 3 files changed, 33 insertions(+), 56 deletions(-) diff --git a/jero-boot/jero-boot-modules/pom.xml b/jero-boot/jero-boot-modules/pom.xml index d1605c902..01f3ad0e8 100644 --- a/jero-boot/jero-boot-modules/pom.xml +++ b/jero-boot/jero-boot-modules/pom.xml @@ -161,6 +161,11 @@ prime-jwt 1.3.1 + + com.alibaba + fastjson + 1.2.62 + 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 f725ac89e..a9fc69a41 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 @@ -46,23 +46,23 @@ public class ProjectRelatedPersonnel implements Serializable { /**法规工程师*/ private java.lang.String lawEngineer; @TableField(exist = false) - @Excel(name = "法规工程师,lawEngineerName", width = 30,orderNum = "2") + @Excel(name = "法规工程师,lawEngineerName", width = 15,orderNum = "2") private java.lang.String lawEngineerName; /**工程接口人*/ private java.lang.String engineeringInterfacePerson; @TableField(exist = false) - @Excel(name = "工程接口人,engineeringInterfacePersonName", width = 30,orderNum = "3") + @Excel(name = "工程接口人,engineeringInterfacePersonName", width = 15,orderNum = "3") private java.lang.String engineeringInterfacePersonName; /**认证工程师*/ private java.lang.String certificationEngineer; @TableField(exist = false) - @Excel(name = "认证工程师,certificationEngineerName", width = 30,orderNum = "4") + @Excel(name = "认证工程师,certificationEngineerName", width = 15,orderNum = "4") private java.lang.String certificationEngineerName; /**备注*/ - @Excel(name = "备注,remark", width = 50,orderNum = "5") + @Excel(name = "备注,remark", width = 15,orderNum = "5") private java.lang.String remark; /**创建人*/ 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 f6cd6ecef..e6c60bbe7 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 @@ -492,6 +492,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl lawEngineerUsers = new ArrayList<>(); if (StringUtils.isNotEmpty(projectRelatedPersonnel.getLawEngineerName())){ List lawEngineerNameList = Arrays.asList(projectRelatedPersonnel.getLawEngineerName().split(",")); - if (CollectionUtils.isNotEmpty(lawEngineerNameList)) { + if (CollectionUtils.isNotEmpty(lawEngineerNameList) && StringUtils.isNotBlank(lawEngineerNameList.get(0))) { lawEngineerNameList = lawEngineerNameList.stream().distinct().collect(Collectors.toList()); lawEngineerUsers=sysUserService.queryUserIdListByNameList(lawEngineerNameList); if(lawEngineerUsers.size()!=lawEngineerNameList.size()){ @@ -567,19 +568,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl engineeringInterfacePersonUsers = new ArrayList<>(); if (StringUtils.isNotEmpty(projectRelatedPersonnel.getEngineeringInterfacePersonName())){ List engineeringInterfacePersonNameList = Arrays.asList(projectRelatedPersonnel.getEngineeringInterfacePersonName().split(",")); - if (CollectionUtils.isNotEmpty(engineeringInterfacePersonNameList)) { + if (CollectionUtils.isNotEmpty(engineeringInterfacePersonNameList) && StringUtils.isNotBlank(engineeringInterfacePersonNameList.get(0))) { engineeringInterfacePersonNameList = engineeringInterfacePersonNameList.stream().distinct().collect(Collectors.toList()); engineeringInterfacePersonUsers=sysUserService.queryUserIdListByNameList(engineeringInterfacePersonNameList); if(engineeringInterfacePersonUsers.size()!=engineeringInterfacePersonNameList.size()){ @@ -606,19 +602,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl certificationEngineerUsers = new ArrayList<>(); if (StringUtils.isNotEmpty(projectRelatedPersonnel.getCertificationEngineerName())){ List certificationEngineerNameList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineerName().split(",")); - if (CollectionUtils.isNotEmpty(certificationEngineerNameList)) { + if (CollectionUtils.isNotEmpty(certificationEngineerNameList) && StringUtils.isNotBlank(certificationEngineerNameList.get(0))) { certificationEngineerNameList = certificationEngineerNameList.stream().distinct().collect(Collectors.toList()); certificationEngineerUsers=sysUserService.queryUserIdListByNameList(certificationEngineerNameList); if(certificationEngineerUsers.size()!=certificationEngineerNameList.size()){ @@ -645,12 +636,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records = projectRelatedPersonnelMapper.queryById(projectRelatedPersonnel.getId()); for (ProjectRelatedPersonnel data : records) { - if (StringUtils.isBlank(data.getLawEngineer())) {//数据库里法规工程师是空的 - projectRelatedPersonnel.setLawEngineer(projectRelatedPersonnel.getLawEngineer()); - }else{//数据库里不空,原+新 - StringBuilder law = new StringBuilder(data.getLawEngineer()); - String lawString = law.append(",").append(projectRelatedPersonnel.getLawEngineer()).toString(); - //去重 + //法规工程师 + 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); } - if (StringUtils.isBlank(data.getEngineeringInterfacePerson())) {//数据库里工程接口人是空的 - projectRelatedPersonnel.setEngineeringInterfacePerson(projectRelatedPersonnel.getEngineeringInterfacePerson()); - }else{//数据库里不空,原+新 - StringBuilder interfacePerson = new StringBuilder(data.getEngineeringInterfacePerson()); - String interfaceString = interfacePerson.append(",").append(projectRelatedPersonnel.getEngineeringInterfacePerson()).toString(); - //去重 + //工程接口人 + 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); } - if (StringUtils.isBlank(data.getCertificationEngineer())) {//数据库里工程接口人是空的 - projectRelatedPersonnel.setCertificationEngineer(projectRelatedPersonnel.getCertificationEngineer()); - }else{//数据库里不空,原+新 - StringBuilder certification = new StringBuilder(data.getCertificationEngineer()); - String certificationString = certification.append(",").append(projectRelatedPersonnel.getCertificationEngineer()).toString(); - //去重 +// 工程接口人 + String certificationString = projectRelatedPersonnel.getCertificationEngineer(); + //去重 + if(StringUtils.isNotBlank(certificationString)) { List certificationList = Arrays.asList(certificationString.split(",")); - String certificationDistinct= certificationList.stream().distinct().collect(Collectors.joining(",")); + String certificationDistinct = certificationList.stream().distinct().collect(Collectors.joining(",")); projectRelatedPersonnel.setCertificationEngineer(certificationDistinct); } if (StringUtils.isBlank(data.getRemark())) {//数据库里备注是空的 projectRelatedPersonnel.setRemark(projectRelatedPersonnel.getRemark()); - } else {//数据库里备注不是空的 - if (StringUtils.isNotBlank(projectRelatedPersonnel.getRemark())) {//导入的备注不是空的 - } - - if (StringUtils.isNotBlank(projectRelatedPersonnel.getRemark())) {//导入的备注不是是空的,原+新 - StringBuilder remark = new StringBuilder(data.getRemark()); - projectRelatedPersonnel.setRemark(remark.append(",").append(projectRelatedPersonnel.getRemark()).toString()); - } else { - projectRelatedPersonnel.setRemark(data.getRemark()); - } + } else { + projectRelatedPersonnel.setRemark(""); } + Date now = new Date(); projectRelatedPersonnel.setUpdateTime(now); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); projectRelatedPersonnel.setUpdateBy(sysUser.getUsername()); - saveOrUpdate(projectRelatedPersonnel); + updateById(projectRelatedPersonnel); } } }