From 4478fecf7330bc9346efcee8e810324d6d837665 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 09:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=AC=A6=E5=90=88-?=
 =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88-=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=8B=E6=9C=AA=E7=BB=B4=E6=8A=A4=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandProjectLibraryServiceImpl.java       | 11 +++++++++--
 .../sarStandardsInfo/entity/SarStandardsInfo.java     |  4 ++++
 .../SarStandProjectLibraryMapper.xml                  |  4 ++--
 3 files changed, 15 insertions(+), 4 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 7ac6049d..210feb35 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
@@ -379,7 +379,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
         wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" +
-                " where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ",
+                " 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 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 + "'");
@@ -408,7 +409,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             p.setStandName(s.getStandName());
             p.setStandType(s.getStandType());
             p.setStandEnName(s.getStandEnName());
-            p.setUnCount(s.getUnCount());
+            if (s.getUnCount()==0L && s.getCounts()>0L) {
+                p.setUnCount(s.getUnCount());
+            }else if (s.getUnCount() == 0L && s.getCounts()==0L){
+                p.setUnCount(2L);
+            }else {
+                p.setUnCount(1L);
+            }
             p.setEndTimes(s.getEndTimes());
             for (SarStandAttrInfo a:list2){
                 if(s.getId().equals(a.getStandId())){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
index 35ed503f..142e98a1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
@@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private Long unCount;
 
+    @ApiModelProperty(value = "为符合数量")
+    @TableField(exist = false)
+    private Long counts;
+
     @ApiModelProperty(value = "整改完成时间")
     @TableField(exist = false)
     private String endTimes;
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
index 2a39e883..d385bc1a 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
@@ -120,10 +120,10 @@
         ON team.project_code = library.project_number
         WHERE
         <if test="flag == 1">
-            library.id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id NOT IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 2">
-            library.id IN ( SELECT project_id FROM sar_stand_project_relation )
+            library.id IN ( SELECT DISTINCT project_id FROM sar_stand_project_relation WHERE project_id is NOT NULL )
         </if>
         <if test="flag == 4">
             1=1