From d2cf8a7f7bcf49ace058d9eec587d75c4f764a2e Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 02 Jan 2024 11:56:13 +0800
Subject: [PATCH] 考核任务设置被考核人

---
 src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml
index 4c5c6c8..840fc01 100644
--- a/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml
+++ b/src/main/java/org/springblade/modules/evaluate/mapper/EvaluateTaskSetMapper.xml
@@ -28,13 +28,19 @@
     <select id="selectEvaluateTaskSetPage" resultMap="evaluateTaskSetVOMap">
         select *,
                CASE type
-                   WHEN 0 THEN ( select count(*) from yw_evaluate_result b where b.evaluate_task_id = a.evaluate_task_id and a.user_id = b.be_id )
-                   WHEN 1 THEN ( select count(*) from yw_evaluate_result b where b.evaluate_task_id = a.evaluate_task_id and a.dept_id = b.be_id )
+                   WHEN 0 THEN ( select count(*) from yw_evaluate_result b where b.evaluate_task_id = a.evaluate_task_id and a.user_id = b.be_id and b.type = 0)
+                   WHEN 1 THEN ( select count(*) from yw_evaluate_result b where b.evaluate_task_id = a.evaluate_task_id and a.dept_id = b.be_id and b.type = 1)
                 END as vote_num
         from yw_evaluate_task_set a where is_deleted = 0
-        <if test="evaluateTaskSet.type !=null and evaluateTaskSet.type!=''">
+        <if test="evaluateTaskSet.type !=null">
             AND type = #{evaluateTaskSet.type}
         </if>
+        <if test="evaluateTaskSet.evaluateTaskName !=null and evaluateTaskSet.evaluateTaskName !=''">
+            AND evaluate_task_name like concat('%', #{evaluateTaskSet.evaluateTaskName},'%')
+        </if>
+        <if test="evaluateTaskSet.deptName !=null and evaluateTaskSet.deptName !=''">
+            AND dept_name like concat('%', #{evaluateTaskSet.deptName},'%')
+        </if>
 
     </select>
 

--
Gitblit v1.9.3