From e6aa1bf44fb42af47961a5e29d56b9b5fb238ee0 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 10 Dec 2021 15:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E5=88=86=E6=9F=A5=E8=AF=A2=20bug?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=A4=9F=E7=B2=BE=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/QualityEvaluationController.java              | 1 +
 .../slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java  | 3 +++
 .../service/impl/QualityEvaluationServiceImpl.java           | 5 +++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java
index c146dbf8..7bcab299 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java
@@ -78,6 +78,7 @@ public class QualityEvaluationController extends BaseController<QualityEvaluatio
         qualityEvaluation.setLawId(form.getLawId()) ;
         qualityEvaluation.setUserId(form.getUserId()) ;
         qualityEvaluation.setEvaluationType(form.getEvaluationType());
+        qualityEvaluation.setProcessNode(form.getProcessNode());
 
         List<QualityEvaluation> evaluationForm = iQualityEvaluationService.getEvaluationForm(qualityEvaluation);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java
index 2620c87d..6466e49a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java
@@ -25,4 +25,7 @@ public class FormVO {
 
     @ApiModelProperty("评分类型")
     private String evaluationType;
+
+    @ApiModelProperty("流程节点名称")
+    private String processNode;
 }
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 c24c9664..97df86c3 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
@@ -84,6 +84,9 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
             queryWrapper.eq("evaluation_type",query.getEvaluationType());
         }
 
+        if (query.getLawId()!=null){ //指定评价指标
+            queryWrapper.eq("law_id",query.getLawId());
+        }
         queryWrapper.eq("`index`.value_type","number");
         //sql计算每个用户的评分
         return qualityEvaluationDao.getHistory(page,queryWrapper);
@@ -114,8 +117,6 @@ public class QualityEvaluationServiceImpl extends ServiceImpl<QualityEvaluationD
 
         if (query.getProcessNode()!=null && !"".equals(query.getProcessNode()) ){
             queryWrapper.eq("process_node",query.getProcessNode());
-        }else {
-            queryWrapper.eq("process_node","");
         }
 
         return qualityEvaluationDao.getEvaluationForm(queryWrapper);