评分查询 bug查询不够精确

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);
 

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;
 }

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);