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

---
 .../java/com/adc/da/slrs/processModel/exportWkExcel.java  | 3 ++-
 .../service/impl/SarStandProjectLibraryServiceImpl.java   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
index 8d8b9259..f246215b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
@@ -78,7 +78,8 @@ public class exportWkExcel {
         char letter = 'A';
         for(letter = 'A'; letter <= 'Z'; ++letter){
             Map<String,String> typeMap = new HashMap<>();
-            typeMap.put("Q/FT "+letter,"Q/FT "+letter);
+            typeMap.put("label","Q/FT "+letter);
+            typeMap.put("value","Q/FT "+letter);
             bussStandTypeList.add(typeMap);
         }
         resultMap.put("BUSSSTANDCLASS",bussStandTypeList);
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 26375cff..b825d7ca 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
@@ -558,7 +558,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                 p.setUnCount(s.getUnCount()); // uncount==0
             }else if (s.getUnCount() == 0L && s.getCounts()==0L){
                 p.setUnCount(2L);
-            }else {
+            }else { // 有不满足时
                 p.setUnCount(1L); // 不符合
             }
             p.setEndTimes(s.getEndTimes());
@@ -573,10 +573,10 @@ 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) {
+            if (0L == s.getUnCount()) { // 没有不满足时
+                if (s.getIsCount() != 0L) { // 只有满足和不涉及---符合
                     p.setUnCount(0L); // 符合
-                } else if (s.getIsOverCount() != 0L) {
+                } else if (s.getIsOverCount() != 0L) { //只有不涉及---不涉及
                     p.setUnCount(-1L); // 不涉及
                 }
             }