From d3ba3f590a1903f1f2ec52b8ac685b3bf3879360 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 20 Dec 2022 17:28:23 +0800
Subject: [PATCH] 通行证sql,评价sql修改

---
 src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml b/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml
index 6b80308..436e33f 100644
--- a/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluation/mapper/EvaluationMapper.xml
@@ -5,9 +5,9 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="evaluationResultMap" type="org.springblade.modules.evaluation.entity.EvaluationEntity">
         <result column="id" property="id"/>
-        <result column="application_id" property="applicationId"/>
+        <result column="no" property="no"/>
         <result column="score" property="score"/>
-        <result column="evaluation" property="evaluation"/>
+        <result column="comment" property="comment"/>
         <result column="feedback" property="feedback"/>
         <result column="tenant_id" property="tenantId"/>
         <result column="create_user" property="createUser"/>
@@ -20,8 +20,16 @@
     </resultMap>
 
 
-    <select id="selectEvaluationPage" resultMap="evaluationResultMap">
-        select * from sys_evaluation where is_deleted = 0
+    <select id="selectEvaluationPage" resultType="org.springblade.modules.evaluation.vo.EvaluationVO">
+        select * from sys_evaluation eva
+        LEFT JOIN sys_application app ON app.no = eva.no AND app.is_deleted = 0
+        where eva.is_deleted = 0
+        <if test="evaluation.userId !=null and evaluation.userId !=''">
+            AND app.user_id = #{evaluation.userId}
+        </if>
+        <if test="evaluation.status !=null and evaluation.status !=''">
+            AND eva.status = #{evaluation.status}
+        </if>
     </select>
 
 

--
Gitblit v1.9.3