From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
index 555d121..3cb6981 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskReferrerMapper.xml
@@ -59,8 +59,13 @@
where a.user_id = b.user_id and a.evaluate_task_id = c.evaluate_task_id and b.is_deleted = 0
) as isAddCandidate
from yw_evaluate_task_referrer a
- where a.is_deleted = 0 and evaluate_task_id = #{evaluateTaskReferrer.evaluateTaskId}
- group by user_id
+ <where>
+ and a.is_deleted = 0 and evaluate_task_id = #{evaluateTaskReferrer.evaluateTaskId}
+ <if test="evaluateTaskReferrer.evaluateTaskCategoryId !=null and evaluateTaskReferrer.evaluateTaskCategoryId !=''">
+ and evaluate_task_category_id = #{evaluateTaskReferrer.evaluateTaskCategoryId}
+ </if>
+ </where>
+ group by user_id order by dept_id,voteNum DESC
</select>
<select id="selectReferrerInfoPage" resultType="org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO">
@@ -87,7 +92,9 @@
</select>
<select id="exportListByTaskId" resultType="org.springblade.modules.evaluate.excel.ReferrerResultGroupExcel">
- SELECT *, count(*) as voteNum FROM yw_evaluate_task_referrer ${ew.customSqlSegment}
+ SELECT b.category_name,a.dept_name,a.user_name,a.post_name, count(*) as voteNum FROM yw_evaluate_task_referrer a
+ LEFT JOIN yw_evaluate_task_category b on (evaluate_task_category_id = b.id)
+ ${ew.customSqlSegment}
</select>
</mapper>
--
Gitblit v1.9.3