From 5a68419a7f7c69421e59168b3606819f4e345036 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 8 Nov 2023 00:48:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?bug:=E8=AF=84=E5=88=86=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/QualityEvaluationServiceImpl.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
index f5f37612..7db1a8c9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.PipedReader;
+import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.util.*;
@@ -301,11 +302,10 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
 
                             return score;
                         } ))));
-        Double finalScore = result.get("quality") * 0.9 + result.get("dynamic");
-//        NumberFormat nf = NumberFormat.getNumberInstance();
-//        nf.setMaximumFractionDigits(2);
-//        nf.setRoundingMode(RoundingMode.UP);
-        result.put("finalScore", finalScore);
+        BigDecimal qualityScore = BigDecimal.valueOf(result.get("quality"));
+        BigDecimal dynamicScore = BigDecimal.valueOf(result.get("dynamic"));
+        double finalScore = qualityScore.setScale(2, RoundingMode.HALF_UP).doubleValue() * 0.9 + dynamicScore.setScale(2, RoundingMode.HALF_UP).doubleValue();
+        result.put("finalScore", new BigDecimal(finalScore).setScale(2, RoundingMode.HALF_UP).doubleValue());
         return result;
 
     }

From 4639619ec61f3b7dd1dd107c5b1446b701da5a37 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 8 Nov 2023 00:49:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?bug:=20=E4=BF=AE=E6=94=B9=E4=BD=93=E7=B3=BB?=
 =?UTF-8?q?=E6=A0=91=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarMenuStandardServiceImpl.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java
index 39a59f7d..b0039b7b 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java
@@ -110,7 +110,7 @@ public class SarMenuStandardServiceImpl extends ServiceImpl<SarMenuStandardDao,
     @Override
     public List<SarMenuStandard> getAll(String dicId) {
         QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>();
-        sarMenuQueryWrapper.eq("VALID_FLAG",0);
+        //sarMenuQueryWrapper.eq("VALID_FLAG",0);
         sarMenuQueryWrapper.eq("DIC_ID",dicId);
         sarMenuQueryWrapper.orderByAsc("DISPLAY_SEQ");
 //        sarMenuQueryWrapper.isNull("PARENT_ID");

From 97841cc7c663349d2b4b71a46065c5607f1c9d92 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 8 Nov 2023 02:02:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?bug:=20=E6=A0=87=E5=87=86=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/QualityEvaluationServiceImpl.java              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
index 7db1a8c9..f31a4f2f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java
@@ -305,6 +305,8 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
         BigDecimal qualityScore = BigDecimal.valueOf(result.get("quality"));
         BigDecimal dynamicScore = BigDecimal.valueOf(result.get("dynamic"));
         double finalScore = qualityScore.setScale(2, RoundingMode.HALF_UP).doubleValue() * 0.9 + dynamicScore.setScale(2, RoundingMode.HALF_UP).doubleValue();
+        result.put("dynamic",dynamicScore.setScale(2, RoundingMode.HALF_UP).doubleValue());
+        result.put("quality",qualityScore.setScale(2, RoundingMode.HALF_UP).doubleValue());
         result.put("finalScore", new BigDecimal(finalScore).setScale(2, RoundingMode.HALF_UP).doubleValue());
         return result;