From 798efa287ba64a564b200966bfabef2de1325a21 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 19 Apr 2022 17:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E8=A1=A8+=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=20=E4=BA=BA?=
 =?UTF-8?q?=E5=90=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/ProjectLibraryBase.java    |  4 --
 .../entity/ProjectRelatedPersonnel.java       |  7 ----
 .../mapper/xml/ProjectLibraryBaseMapper.xml   |  3 +-
 .../xml/ProjectRelatedPersonnelMapper.xml     |  7 ----
 .../impl/ProjectLibraryBaseServiceImpl.java   | 41 +++++++------------
 .../ProjectRelatedPersonnelServiceImpl.java   | 27 ++----------
 6 files changed, 19 insertions(+), 70 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index 4f80924c6..ff8c3555a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -46,15 +46,11 @@ public class ProjectLibraryBase implements Serializable {
     private java.lang.String studioEngineer;
     @TableField(exist = false)
     private java.lang.String studioEngineerName;
-    @TableField(exist = false)
-    private java.lang.String studioEngineerEnName;
 
     /**认证工程师*/
     private java.lang.String certificationEngineer;
     @TableField(exist = false)
     private java.lang.String certificationEngineerName;
-    @TableField(exist = false)
-    private java.lang.String certificationEngineerEnName;
 
     /**车型平台*/
     @Dict(dicCode = "vehicle_platform")
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 e69ecf1e2..bbfb9df16 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
@@ -45,25 +45,18 @@ public class ProjectRelatedPersonnel implements Serializable {
     private java.lang.String lawEngineer;
     @TableField(exist = false)
     private java.lang.String lawEngineerName;
-    @TableField(exist = false)
-    private java.lang.String lawEngineerEnName;
-
 
     /**工程接口人*/
     @Excel(name = "工程接口人", width = 30,orderNum = "3")
     private java.lang.String engineeringInterfacePerson;
     @TableField(exist = false)
     private java.lang.String engineeringInterfacePersonName;
-    @TableField(exist = false)
-    private java.lang.String engineeringInterfacePersonEnName;
 
     /**认证工程师*/
     @Excel(name = "认证工程师", width = 30,orderNum = "4")
     private java.lang.String certificationEngineer;
     @TableField(exist = false)
     private java.lang.String certificationEngineerName;
-    @TableField(exist = false)
-    private java.lang.String certificationEngineerEnName;
 
     /**备注*/
     @Excel(name = "备注", width = 50,orderNum = "5")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index f96d02fcd..e3a07ba6d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -29,8 +29,7 @@
             plb.target_market,
             plb.project_status,
             plb.studio_engineer,
-            studiouser.realname as studio_engineer_name,
-            studiouser.username as studio_engineer_en_name,
+            studiouser.username as studio_engineer_name,
             plb.certification_engineer,
             plb.vehicle_platform,
             plb.digital_platform,
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
index f770ac41f..63c8d1611 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
@@ -19,8 +19,6 @@
             prp.project_id,
             prp.duty_territory,
             prp.law_engineer,
-            lawuser.username,
-            enguser.username,
             prp.engineering_interface_person,
             prp.certification_engineer,
             prp.remark,
@@ -32,11 +30,8 @@
     <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
         SELECT
         <include refid="select_item"/>
-
         FROM
             project_related_personnel AS prp
-                LEFT JOIN sys_user AS lawuser ON prp.law_engineer = lawuser.id
-                LEFT JOIN sys_user AS enguser ON prp.engineering_interface_person = enguser.id
         <where>
             <if test="params.projectId != null and params.projectId != ''">
             prp.project_id=#{params.projectId}
@@ -50,8 +45,6 @@
         <include refid="select_item"/>
         FROM
         project_related_personnel AS prp
-        LEFT JOIN sys_user AS lawuser ON prp.law_engineer = lawuser.id
-        LEFT JOIN sys_user AS enguser ON prp.engineering_interface_person = enguser.id
         <where>
             prp.id=#{id}
         </where>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index fad032de3..f9c406904 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -151,41 +151,30 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		for (ProjectLibraryBase projectLibraryBase:records) {
 			List<SysUser> sysUsers = new ArrayList<>();
 			//认证工程师多个id查询
-			List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
-			if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) {
-				certificationEngineerIdList=certificationEngineerIdList.stream().distinct().collect(Collectors.toList());
-				QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
-				userqueryWrapper.in("id ", certificationEngineerIdList);
-				sysUsers = sysUserMapper.selectList(userqueryWrapper);
-			}
+			if (StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())) {
+				List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
+				if (CollectionUtils.isNotEmpty(certificationEngineerIdList)) {
+					certificationEngineerIdList = certificationEngineerIdList.stream().distinct().collect(Collectors.toList());
+					QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
+					userqueryWrapper.in("id ", certificationEngineerIdList);
+					sysUsers = sysUserMapper.selectList(userqueryWrapper);
+				}
 
-				if(CollectionUtils.isNotEmpty(sysUsers)) {
+				if (CollectionUtils.isNotEmpty(sysUsers)) {
 					String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
-					String certificationEngineerName=null;
-					String certificationEngineerEnName=null;
-					StringBuilder certificationName=new StringBuilder();
-					
-					for (String data:certificationEngineerIdList){
+					String certificationEngineerName = null;
+
+					for (String data : certificationEngineerIdList) {
 						if (StringUtils.isNotEmpty(certificationEngineerId)) {
 							certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId()))
-									.map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(","));
-							certificationEngineerEnName = sysUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
+
 						}
-
-						certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" ");
-
 					}
-					projectLibraryBase.setCertificationEngineerName(certificationName.toString());
-
+					projectLibraryBase.setCertificationEngineerName(certificationEngineerName);
 				}
-			StringBuilder studioCnName= new StringBuilder(projectLibraryBase.getStudioEngineerName());
-			StringBuilder studioEnName= new StringBuilder(projectLibraryBase.getStudioEngineerEnName());
-			String studioName = studioCnName.append("(").append(studioEnName).append(")").toString();
-			projectLibraryBase.setStudioEngineerName(studioName);
+			}
 		}
-
-
 	}
 
 }
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 4ac2a579b..ec88e2505 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
@@ -157,21 +157,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				if(CollectionUtils.isNotEmpty(lawEngineerUsers)) {
 					String lawEngineerId = projectRelatedPersonnel.getLawEngineer();
 					String lawEngineerName = null;
-					String lawEngineerEnName = null;
-					StringBuilder certificationName = new StringBuilder();
 
 					for (String data : lawEngineerIdList) {
 						if (StringUtils.isNotEmpty(lawEngineerId)) {
 							lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
-									.map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(","));
-							lawEngineerEnName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-
-						certificationName.append(lawEngineerName).append("(").append(lawEngineerEnName).append(")").append(" ");
-
 					}
-					projectRelatedPersonnel.setLawEngineerName(certificationName.toString());
+					projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
 				}
 			}
 
@@ -188,21 +181,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				if (CollectionUtils.isNotEmpty(engineeringInterfacePersonUsers)) {
 					String engineeringInterfacePersonId = projectRelatedPersonnel.getEngineeringInterfacePerson();
 					String engineeringInterfacePersonName = null;
-					String engineeringInterfacePersonEnName = null;
-					StringBuilder certificationName = new StringBuilder();
 
 					for (String data : engineeringInterfacePersonIdList) {
 						if (StringUtils.isNotEmpty(engineeringInterfacePersonId)) {
 							engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
-									.map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(","));
-							engineeringInterfacePersonEnName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-
-						certificationName.append(engineeringInterfacePersonName).append("(").append(engineeringInterfacePersonEnName).append(")").append(" ");
-
 					}
-					projectRelatedPersonnel.setEngineeringInterfacePersonName(certificationName.toString());
+					projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
 				}
 			}
 
@@ -219,21 +205,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				if(CollectionUtils.isNotEmpty(certificationEngineerUsers)) {
 					String certificationEngineerId = projectRelatedPersonnel.getCertificationEngineer();
 					String certificationEngineerName = null;
-					String certificationEngineerEnName = null;
-					StringBuilder certificationName = new StringBuilder();
 
 					for (String data : certificationEngineerIdList) {
 						if (StringUtils.isNotEmpty(certificationEngineerId)) {
 							certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
-									.map(sysUser -> sysUser.getRealname()).collect(Collectors.joining(","));
-							certificationEngineerEnName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-
-						certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" ");
-
 					}
-					projectRelatedPersonnel.setCertificationEngineerName(certificationName.toString());
+					projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
 				}
 			}