From 20f76b5f83aa57839b294ba66c1308ab3afd47fa Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 7 Nov 2022 17:47:34 +0800
Subject: [PATCH] =?UTF-8?q?275-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandProjectLibraryServiceImpl.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index b825d7ca..54ae351c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -478,8 +478,10 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 "(select count(*) from sar_stand_unqualified ssu " +
                 "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
                 " where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '2' and pn.id = '" + standId + "') as counts ",
-                "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME )  from sar_stand_unqualified where " +
-                " STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes ");
+
+                "(select GROUP_CONCAT( DISTINCT DATE_FORMAT( ssu.PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY ssu.PLAN_CLOSE_TIME )  from sar_stand_unqualified ssu " +
+                "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
+                " where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '1' AND ssu.PLAN_CLOSE_TIME is NOT NULL and pn.id = '" + standId + "') as endTimes ");
         wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'" +
                 "union all " +
                 "SELECT " +
@@ -507,13 +509,14 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 " where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '2' and pn.id = '" + standId + "') as counts, "+
                 "(" +
                 "SELECT " +
-                "GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) " +
+                "GROUP_CONCAT( DISTINCT DATE_FORMAT( ssu.PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY ssu.PLAN_CLOSE_TIME ) " +
                 "FROM " +
-                "sar_stand_unqualified " +
+                "sar_stand_unqualified ssu inner join sar_stand_project_library pn on pn.project_number = ssu.product_id " +
                 "WHERE " +
-                "STAND_ID = r.stand_id " +
-                "AND CLOSE_STATE = '1' " +
-                "AND PLAN_CLOSE_TIME IS NOT NULL " +
+                "ssu.STAND_ID = r.stand_id " +
+                "AND ssu.CLOSE_STATE = '1' " +
+                "AND ssu.PLAN_CLOSE_TIME IS NOT NULL " +
+                "AND pn.id = '" + standId + "' " +
                 ") AS endTimes " +
                 "FROM " +
                 "sar_bussioness_stand " +