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/EvaluateCandidateResultMapper.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml
index 83cd7e9..20554d2 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateCandidateResultMapper.xml
@@ -28,6 +28,28 @@
select * from yw_evaluate_candidate_result where is_deleted = 0
</select>
+ <select id="selectCandidateResultInfoPage" resultType="org.springblade.modules.evaluate.vo.EvaluateCandidateResultVO">
+ select a.*,b.`name` as voteUserName,c.dept_name AS voteDeptName,d.post_name AS votePostName from
+ (select * from yw_evaluate_candidate_result where is_deleted = 0 ) a
+ LEFT JOIN blade_user b ON (a.create_user = b.id)
+ LEFT JOIN blade_dept c ON (b.dept_id = c.id)
+ LEFT JOIN blade_post d ON (b.post_id = d.id)
+ <where>
+ <if test="evaluateCandidateResult.evaluateTaskId != null and evaluateCandidateResult.evaluateTaskId != ''">
+ and a.evaluate_task_id = #{evaluateCandidateResult.evaluateTaskId}
+ </if>
+ <if test="evaluateCandidateResult.userName != null and evaluateCandidateResult.userName != ''">
+ and a.user_name like concat('%', #{evaluateCandidateResult.userName}, '%')
+ </if>
+ <if test="evaluateCandidateResult.deptName != null and evaluateCandidateResult.deptName != ''">
+ and a.dept_name like concat('%', #{evaluateCandidateResult.deptName}, '%')
+ </if>
+ <if test="evaluateCandidateResult.voteUserName != null and evaluateCandidateResult.voteUserName != ''">
+ and b.name like concat('%', #{evaluateCandidateResult.voteUserName}, '%')
+ </if>
+ </where>
+ </select>
+
<select id="exportEvaluateCandidateResult" resultType="org.springblade.modules.evaluate.excel.EvaluateCandidateResultExcel">
SELECT * FROM yw_evaluate_candidate_result ${ew.customSqlSegment}
@@ -38,7 +60,7 @@
</select>
<select id="exportEmployeeResultGroupExcel" resultType="org.springblade.modules.evaluate.excel.EmployeeResultGroupExcel">
- select b.category_name,b.standard,a.user_name,a.dept_name,a.post_name,count(*) voteNum from yw_evaluate_candidate_result a
+ select b.category_name,a.user_name,a.dept_name,a.post_name,count(*) voteNum from yw_evaluate_candidate_result a
LEFT JOIN yw_evaluate_task_category b ON (a.evaluate_task_category_id = b.id)
${ew.customSqlSegment}
--
Gitblit v1.9.3