From 8b82bfac9f6662a27842c013ebd545da7cf6b831 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 8 Sep 2022 13:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86=E9=9D=9E=E6=94=B9=E9=A1=B9=E7=9B=AE=E4=B8=8B=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandProjectLibraryServiceImpl.java     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 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 27bfb941..34233545 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
@@ -460,9 +460,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         //cars传回值为1时判断是从车型项目库中调取
 
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
-        wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","ISSUE_TIME","(select count(*) from sar_stand_unqualified " +
-                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" +
-                        " where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ",
+        wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","ISSUE_TIME",
+                "(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 = '1' and pn.id = '" + standId + "') as unCount ",
+                "(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 ");
         wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'" +
@@ -477,8 +481,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 "TEXT_STATUS_BUSS as TEXT_STATUS," +
                 "'BUSINESS_STAND' as STAND_TYPE," +
                 "ISSUE_TIME,"+
-                "( SELECT count( * ) FROM sar_stand_unqualified WHERE STAND_ID = r.stand_id AND CLOSE_STATE = '1' ) AS unCount," +
-                "( SELECT count( * ) FROM sar_stand_unqualified WHERE STAND_ID = r.stand_id AND CLOSE_STATE = '2' ) AS counts," +
+                "(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 = '1' and pn.id = '" + standId + "') as unCount, "+
+                "(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 ) " +