From b15cd814ca82087af7f8a0248ae16e533aa69709 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 7 Jan 2022 14:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=B5=81=E7=A8=8B=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E8=AF=84=E5=88=86=20=E8=AE=A1=E7=AE=97=E6=80=BB?=
 =?UTF-8?q?=E5=88=86=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    |  8 ++++----
 .../QualityEvaluationMapper.xml                       | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 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 6b8980ed..e721dc00 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
@@ -152,11 +152,11 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
         /**
          * 同一节点为多人评价时，需要取多人评价的平均分用以计算最终得分。
          * 各环节评分权重分别设置为30%、40%、30%，
-         * 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师和标准法规部主管领导评价平均分*30%。
+         * 即：标准编写质量最终得分=征求意见会签人评价平均分*30%+技术委员会专家评价平均分*40%+标准法规工程师  "和"  标准法规部主管领导评价平均分*30%。
          */
         result.putAll(list.stream()
                 .collect(Collectors.groupingBy(QualityEvaluation::getEvaluationType,
-                        Collectors.averagingDouble(item ->{
+                        Collectors.summingDouble(item ->{
 
                             Double score;
                             String value;
@@ -173,10 +173,10 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
                                     score=Double.valueOf(item.getScore()) * 0.4;
                                     break;
                                 case "标准法规工程师复审":
-                                    score=Double.valueOf(item.getScore()) * 0.3;
+                                    score=Double.valueOf(item.getScore()) * 0.15;
                                     break;
                                 case "标准法规部部长审核":
-                                    score=Double.valueOf(item.getScore()) * 0.3;
+                                    score=Double.valueOf(item.getScore()) * 0.15;
                                     break;
 
                                 default: score=Double.valueOf(item.getScore());
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 86929393..e0ca3281 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
@@ -11,9 +11,8 @@
 			`index`.value_type as valueType,
 			eva.evaluation_type as evaluationType,
 			process_node as processNode,
-			avg(eva.score * `index`.weight) AS score,
-			min(eva.create_time) as createTiem,
-			max(eva.modify_time) as modifyTime
+			sum(eva.score * `index`.weight) AS score,
+			max(eva.create_time) as createTiem
 		FROM
 			quality_evaluation AS eva
 		LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID
@@ -26,7 +25,7 @@
 			valueType,
 			evaluationType,
 			process_node
-		ORDER BY modifyTime DESC,process_node ASC
+		ORDER BY createTiem DESC,process_node ASC
 
     </select>
 
@@ -36,6 +35,7 @@
 			resultType="com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation">
 
 		SELECT
+		DISTINCT
 			UNAME AS userName,
 			score,
 			reason,
@@ -48,7 +48,8 @@
 			`index`.one_index_title as oneIndexTitle,
 			`index`.two_index_title as twoIndexTitle,
 			`index`.three_index_title as threeIndexTitle,
-			`index`.weight as weight
+			`index`.weight as weight,
+			`index`.index_sort
 		FROM
 			quality_evaluation
 		LEFT JOIN ts_user `user` ON quality_evaluation.user_id = `user` .USID