From 9e304d8ac11334414add37453b6d12744ed3cc0d Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 8 Nov 2023 08:48:06 +0800
Subject: [PATCH] =?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

---
 .../dao/QualityEvaluationDao.java             |  2 +-
 .../impl/QualityEvaluationServiceImpl.java    | 67 ++++++++-----------
 .../QualityEvaluationMapper.xml               |  1 +
 3 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java
index 0d5d20e1..c4b39c80 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/dao/QualityEvaluationDao.java
@@ -37,7 +37,7 @@ public interface QualityEvaluationDao extends BaseMapper<QualityEvaluation> {
 
     List<Integer> selectBZSH(@Param("node") String node,@Param("lawId") String lawId);
 
-    List<Integer> selectDTPJ(String processNode,@Param("lawId") String lawId);
+    List<Integer> selectDTPJ(@Param("lawId") String lawId);
 
     void updateByProcessNode(@Param("lawId") String lawId);
 
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 f31a4f2f..e4ebcdce 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
@@ -64,6 +64,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
 
         QueryWrapper<QualityEvaluation> qw = new QueryWrapper();
         qw.eq("law_id",form.getLawId());
+        qw.eq("user_id",form.getUserId());
         qw.eq("evaluation_type","dynamic");
         List<QualityEvaluation> list = this.baseMapper.selectList(qw);
 
@@ -198,47 +199,35 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
         Integer countBZHFSStr = null;
         Integer countBZSHStr = null;
         Integer countDTPJStr = null;
-        if(!list.isEmpty()){
-            for (QualityEvaluation qualityEvaluations :list){
-                if("征求意见".equals(qualityEvaluations.getProcessNode())) {
-                  List<Integer>  countZQYJList = qualityEvaluationDao.selectCountZQYJ(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId());
-                  if(!countZQYJList.isEmpty()){
-                      countZQYJStr = countZQYJList.size();
-                  }
-                }
-
-                if("技术委员会评审、评审意见修改".equals(qualityEvaluations.getProcessNode())) {
-                    List<Integer> countJSWYList = qualityEvaluationDao.selectCountJSWY(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId());
-                    if(!countJSWYList.isEmpty()){
-                        countJSWYStr = countJSWYList.size();
-                    }
-                }
-                if("重新技术委员会评审、评审意见修改".equals(qualityEvaluations.getProcessNode())) {
-                    List<Integer> countCXJSWYList = qualityEvaluationDao.selectCXJSWY(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId());
-                    if(!countCXJSWYList.isEmpty()){
-                        countCXJSWYStr = countCXJSWYList.size();
-                    }
-                }
-                if("标准化复审".equals(qualityEvaluations.getProcessNode())) {
-                    List<Integer> countBZHFSList = qualityEvaluationDao.selectBZHFS(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId());
-                    if(!countBZHFSList.isEmpty()){
-                        countBZHFSStr = countBZHFSList.size();
-                    }
-                }
-                if("标准法规部高级经理审核".equals(qualityEvaluations.getProcessNode())) {
-                    List<Integer> countBZSHList = qualityEvaluationDao.selectBZSH(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId());
-                    if(!countBZSHList.isEmpty()){
-                        countBZSHStr = countBZSHList.size();
-                    }
-                }
-                if ("动态评价".equals(qualityEvaluations.getProcessNode())) {
-                    List<Integer> countDTPJList = qualityEvaluationDao.selectDTPJ(qualityEvaluations.getProcessNode(), qualityEvaluations.getLawId());
-                    if(!countDTPJList.isEmpty()){
-                        countDTPJStr = countDTPJList.size();
-                    }
-                }
+        if (!list.isEmpty()) {
+            List<Integer> countZQYJList = qualityEvaluationDao.selectCountZQYJ("征求意见", lawId);
+            if (!countZQYJList.isEmpty()) {
+                countZQYJStr = countZQYJList.size();
             }
+
+            List<Integer> countJSWYList = qualityEvaluationDao.selectCountJSWY("技术委员会评审、评审意见修改", lawId);
+            if (!countJSWYList.isEmpty()) {
+                countJSWYStr = countJSWYList.size();
+            }
+            List<Integer> countCXJSWYList = qualityEvaluationDao.selectCXJSWY("重新技术委员会评审、评审意见修改", lawId);
+            if (!countCXJSWYList.isEmpty()) {
+                countCXJSWYStr = countCXJSWYList.size();
+            }
+            List<Integer> countBZHFSList = qualityEvaluationDao.selectBZHFS("标准化复审", lawId);
+            if (!countBZHFSList.isEmpty()) {
+                countBZHFSStr = countBZHFSList.size();
+            }
+            List<Integer> countBZSHList = qualityEvaluationDao.selectBZSH("标准法规部高级经理审核", lawId);
+            if (!countBZSHList.isEmpty()) {
+                countBZSHStr = countBZSHList.size();
+            }
+            List<Integer> countDTPJList = qualityEvaluationDao.selectDTPJ(lawId);
+            if (!countDTPJList.isEmpty()) {
+                countDTPJStr = countDTPJList.size();
+            }
+//
         }
+
         final Integer countZQYJ = countZQYJStr;
         final Integer countJSWY = countJSWYStr;
         final Integer countCXJSWY = countCXJSWYStr;
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml
index 96c41de3..7a33ee29 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml
@@ -132,5 +132,6 @@
         where
             law_id = #{lawId}
           and process_node = '动态评价'
+        group by user_id;
     </select>
 </mapper>