From 13b5444e247676e3f7446ac8408b105c404a1997 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 10 Dec 2021 13:47:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=AF=84=E5=88=86=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/QualityEvaluationServiceImpl.java          | 6 ++++++
 .../QualityEvaluationMapper.xml                             | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

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 765241da..c24c9664 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
@@ -112,6 +112,12 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
             queryWrapper.eq("evaluation_type",query.getEvaluationType());
         }
 
+        if (query.getProcessNode()!=null && !"".equals(query.getProcessNode()) ){
+            queryWrapper.eq("process_node",query.getProcessNode());
+        }else {
+            queryWrapper.eq("process_node","");
+        }
+
         return qualityEvaluationDao.getEvaluationForm(queryWrapper);
     }
 
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 20dc0681..2a958245 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
@@ -10,6 +10,7 @@
 			eva.user_id,
 			`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
@@ -23,7 +24,8 @@
 			eva.user_id,
 			index_type,
 			valueType,
-			evaluationType
+			evaluationType,
+			process_node
 		ORDER BY modifyTime DESC
 
     </select>
@@ -38,6 +40,7 @@
 			score,
 			reason,
 			evaluation_index as evaluationIndex,
+			process_node as processNode,
 			quality_evaluation.create_time AS createTime,
 			quality_evaluation.modify_time AS modifyTime,
 			`index`.value_type AS valueType,