From d63ec599cce1fd43e79f82eac9d189b1c4a044bc Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 8 Sep 2022 16:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=AE=8C=E7=BB=93=E4=B9=8B=E5=90=8E=EF=BC=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BA=93=E5=BD=92=E6=A1=A3=E6=9C=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E7=AC=A6=E5=90=88=EF=BC=8C=E4=B8=8D=E6=B6=89=E5=8F=8A?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=BD=92=E6=A1=A3=EF=BC=8C=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=A8=A1=E5=9D=97=E5=BD=92=E6=A1=A3=E6=B2=A1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/FeignClient/workFlowFeignClient.java   |  4 ++--
 .../SarStandProjectLibraryServiceImpl.java    | 24 +++++++++++++++++++
 .../entity/SarStandardsInfo.java              |  8 +++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
index ff88272a..581dd4d9 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
@@ -18,8 +18,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-//@FeignClient(value = "bat-wkflow-test")
-@FeignClient(value = "bat-wkflow")
+@FeignClient(value = "bat-wkflow-test")
+//@FeignClient(value = "bat-wkflow")
 //@FeignClient(value = "shan6")
 public interface workFlowFeignClient {
 
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 34233545..99a64b24 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
@@ -464,6 +464,15 @@ 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 = '1' and pn.id = '" + standId + "') as unCount ",
+
+                "(select count(*) from sar_standard_compliance_product_assess ssu " +
+                "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
+                " where ssu.STAND_ID = r.stand_id and ssu.no_involve is not null and pn.id = '" + standId + "') as isOverCount ",
+
+                "(select count(*) from sar_standard_compliance_product_assess ssu " +
+                "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
+                " where ssu.STAND_ID = r.stand_id and ssu.no_involve is null and pn.id = '" + standId + "') as isCount ",
+
                 "(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 ",
@@ -484,6 +493,13 @@ 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 = '1' and pn.id = '" + standId + "') as unCount, "+
+                        "(select count(*) from sar_standard_compliance_product_assess ssu " +
+                        "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
+                        " where ssu.STAND_ID = r.stand_id and ssu.no_involve is not null and pn.id = '" + standId + "') as isOverCount, "+
+
+                "(select count(*) from sar_standard_compliance_product_assess ssu " +
+                        "inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
+                        " where ssu.STAND_ID = r.stand_id and ssu.no_involve is null and pn.id = '" + standId + "') as isCount, "+
                 "(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, "+
@@ -555,6 +571,14 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             if(StringUtils.equals(s.getStandType(),"BUSINESS_STAND")){
                 p.setSSRQ(s.getIssueTime());
             }
+            if (0L == s.getUnCount()) {
+                if (s.getIsCount() != 0L) {
+                    p.setUnCount(0L);
+                }
+                if (s.getIsOverCount() != 0L) {
+                    p.setUnCount(-1L);
+                }
+            }
             list.add(p);
         }
         IPage<StandAttrInfoDto> userIPage = new Page<>();
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 a1d27dfd..80492274 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
@@ -158,6 +158,14 @@ public class SarStandardsInfo extends BaseEntity {
     @TableField(exist = false)
     private String endTimes;
 
+    @ApiModelProperty(value = "符合数量")
+    @TableField(exist = false)
+    private Long isCount;
+
+    @ApiModelProperty(value = "不涉及数量")
+    @TableField(exist = false)
+    private Long isOverCount;
+
 
     // 以下为非表中字段
     @TableField(exist = false)