From f1e30c3fd5d3a083186ff825d0ac9f5673057dab Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 25 Apr 2022 13:31:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=2052667=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rStandardComplianceProductAssessMapper.xml | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
index e4bb59e3..a40576d8 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml
@@ -8,14 +8,27 @@
         select sar_stand_project_library.project_name as productName,sar_stand_project_library.project_group as projectGroup,
         sar_stand_project_library.id as sarId,
         sar_stand_project_library.product_line as productLine,sar_stand_project_library.project_number as productId,
-        sar_stand_project_library.project_manager as projectManager,ts_user.UNAME as uName,
+        team.ids as projectManager,team.name as uName,
         (SELECT count(*) FROM sar_stand_unqualified WHERE sar_stand_unqualified.STAND_ID = #{product.standId} AND CLOSE_STATE = '1' ) unCount,
         (SELECT count(*) FROM sar_standard_compliance_product_assess sspa  WHERE sspa.STAND_ID=#{product.standId} and sspa.no_involve is not null and sspa.no_involve !='' ) unCounts,
         (SELECT count(*) FROM sar_standard_compliance_product_assess sspa  WHERE sspa.STAND_ID=#{product.standId} ) allCounts
         FROM
         sar_stand_project_library
         LEFT JOIN sar_stand_unqualified ON sar_stand_unqualified.product_id = sar_stand_project_library.project_number
-        LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager
+        <!--LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager-->
+        LEFT JOIN (
+        SELECT
+        GROUP_CONCAT(sar_stand_project_team.name) as name ,GROUP_CONCAT(sar_stand_project_team.user_id) as ids ,sar_stand_project_team.project_code
+        FROM
+        sar_stand_project_team
+        LEFT JOIN sar_stand_project_team AS a ON a.project_code = sar_stand_project_team.project_code
+        AND a.id != sar_stand_project_team.id
+        group by
+        sar_stand_project_team.project_code
+        )
+        as team
+        ON team.project_code = sar_stand_project_library.project_number
+
         WHERE
         sar_stand_project_library.project_number in ( SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId})
         <if test="null != product.productName and ''!= product.productName">
@@ -28,10 +41,10 @@
         sar_stand_project_library.project_name,
         sar_stand_project_library.project_group,
         sar_stand_project_library.product_line,
-        sar_stand_project_library.project_manager,
+        team.ids,
         sar_stand_project_library.project_number,
         sar_stand_project_library.id,
-        ts_user.UNAME
+        team.name
         ORDER BY
         sar_stand_project_library.project_name ASC
         limit ${(page-1)*pageSize},${pageSize}
@@ -43,7 +56,19 @@
         FROM
         sar_stand_project_library
         LEFT JOIN sar_stand_unqualified ON sar_stand_unqualified.product_id = sar_stand_project_library.project_number
-        LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager
+        <!--LEFT JOIN ts_user ON ts_user.USID = sar_stand_project_library.project_manager-->
+        LEFT JOIN (
+        SELECT
+        GROUP_CONCAT(sar_stand_project_team.name) as name ,GROUP_CONCAT(sar_stand_project_team.user_id) as ids ,sar_stand_project_team.project_code
+        FROM
+        sar_stand_project_team
+        LEFT JOIN sar_stand_project_team AS a ON a.project_code = sar_stand_project_team.project_code
+        AND a.id != sar_stand_project_team.id
+        group by
+        sar_stand_project_team.project_code
+        )
+        as team
+        ON team.project_code = sar_stand_project_library.project_number
         WHERE
         sar_stand_project_library.project_number in (SELECT product_id FROM sar_standard_compliance_product_assess WHERE STAND_ID=#{product.standId})
         <if test="null != product.productName and ''!= product.productName">
@@ -56,10 +81,10 @@
         sar_stand_project_library.project_name,
         sar_stand_project_library.project_group,
         sar_stand_project_library.product_line,
-        sar_stand_project_library.project_manager,
+        team.ids,
         sar_stand_project_library.project_number,
         sar_stand_project_library.id,
-        ts_user.UNAME
+        team.name
         ORDER BY
         sar_stand_project_library.project_name ASC
     </select>