From 37e56d7ebeb154b381447b51a5a2448e7f9e6c72 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 18 Apr 2022 00:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=88=97=E8=A1=A8-?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLibraryBaseController.java         |  1 -
 .../entity/ProjectRelatedPersonnel.java       |  4 ++
 .../mapper/xml/ProjectLibraryBaseMapper.xml   | 22 ++--------
 .../impl/ProjectLibraryBaseServiceImpl.java   | 44 ++++++++++++-------
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
index decdee3e6..b8db3e277 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java
@@ -3,7 +3,6 @@ package com.jero.modules.project.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
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 94a7c6220..725b6fd7d 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
@@ -1,6 +1,7 @@
 package com.jero.modules.project.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -65,4 +66,7 @@ public class ProjectRelatedPersonnel implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private java.util.Date updateTime;
 
+    /**中英切换标志*/
+    @TableField(exist = false)
+    private String cut;
 }
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 4de51d955..c6e62a759 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
@@ -28,23 +28,13 @@
             plb.project_name,
 
             plb.target_market,
-            marketsdi.item_text as target_market_name,
-            marketsdi.en_name as target_market_en_name,
             plb.project_status,
-            statussdi.item_text as project_status_name,
-            statussdi.en_name as project_status_en_name,
             plb.studio_engineer,
             studiouser.realname as studio_engineer_name,
             studiouser.username as studio_engineer_en_name,
             plb.certification_engineer,
-            certifyuser.realname as certification_engineer_name,
-            certifyuser.username as certification_engineer_en_name,
             plb.vehicle_platform,
-            vehiclePlatformsdi.item_text as vehicle_platform_name,
-            vehiclePlatformsdi.en_name as vehicle_platform_en_name,
             plb.digital_platform,
-            digitalPlatformsdi.item_text as digital_platform_name,
-            digitalPlatformsdi.en_name as digital_platform_en_name,
             plb.ipd_info,
             plb.vehicle_development_plan,
             plb.attestation_plan,
@@ -56,14 +46,10 @@
             plb.update_time
         from project_library_base as plb
 
-                 left join sys_dict_item as marketsdi on plb.target_market=marketsdi.item_value
-                 left join sys_dict_item as statussdi on plb.project_status=statussdi.item_value
-                 left join sys_user as studiouser on plb.studio_engineer=studiouser.id
-                 left join sys_user as certifyuser on plb.certification_engineer=certifyuser.id
-                 left join sys_dict_item as vehiclePlatformsdi on plb.vehicle_platform=vehiclePlatformsdi.item_value
-                 left join sys_dict_item as digitalPlatformsdi on plb.digital_platform=digitalPlatformsdi.item_value
-                 left join sys_user as createuser on plb.create_user_id=createuser.id
-                 left join sys_user as updateuser on plb.update_user_id=updateuser.id
+
+        left join sys_user as studiouser on plb.studio_engineer=studiouser.id
+        left join sys_user as createuser on plb.create_user_id=createuser.id
+        left join sys_user as updateuser on plb.update_user_id=updateuser.id
     </sql>
 
     <select id="queryPageList" resultType="com.jero.modules.project.entity.ProjectLibraryBase">
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 a1f5e9be2..42883532d 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
@@ -17,10 +17,7 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -103,7 +100,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Override
 	public List<ProjectLibraryBase> queryById(String id) {
 		List<ProjectLibraryBase> records = projectLibraryBaseMapper.queryById(id);
-			return records;
+		disposeData(records);
+		return records;
 	}
 
 	/**
@@ -138,24 +136,36 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		for (ProjectLibraryBase projectLibraryBase:records) {
 			List<SysUser> sysUsers = new ArrayList<>();
 			//认证工程师多个id查询
-			String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
-			if (StringUtils.isNotEmpty(certificationEngineerId)) {
+			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 ", certificationEngineerId);
+				userqueryWrapper.in("id ", certificationEngineerIdList);
 				sysUsers = sysUserMapper.selectList(userqueryWrapper);
 			}
-			if(CollectionUtils.isNotEmpty(sysUsers)) {
-				if(StringUtils.isNotEmpty(certificationEngineerId)){
-					String certificationEngineerName=sysUsers.stream().filter(e -> certificationEngineerId.equals(e.getId())).
-							map(SysUser::getRealname).collect(Collectors.joining(","));
-					projectLibraryBase.setCertificationEngineerName(certificationEngineerName);
+
+				if(CollectionUtils.isNotEmpty(sysUsers)) {
+					String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
+					String certificationEngineerName=null;
+					String certificationEngineerEnName=null;
+					StringBuilder name=new StringBuilder();
+					StringBuilder enName=new StringBuilder();
+					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(","));
+						}
+
+						name.append(certificationEngineerName).append(" ");
+						enName.append(certificationEngineerEnName).append(" ");
+					}
+					projectLibraryBase.setCertificationEngineerName(name.toString());
+					projectLibraryBase.setCertificationEngineerEnName(enName.toString());
 				}
 			}
 
-		}
-
-
-
 
 	}