From 3dccfd47f114dbbbab6bfa5843f40c8e6415b652 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 23 Jan 2024 11:25:44 +0800
Subject: [PATCH] 按奖项id筛选
---
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
index 4a920c6..a4ba966 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
@@ -95,10 +95,10 @@
b.user_name,b.dept_name ,b.post_name,
<if test="assessmentScore.type != null and assessmentScore.type == 0">
- c.score_val,c.remark,c.type,c.weight
+ c.score_val,c.remark,c.type,a.weight
</if>
<if test="assessmentScore.type != null and assessmentScore.type == 1">
- d.score_val,d.remark,d.type,d.weight
+ d.score_val,d.remark,d.type,a.weight
</if>
from yw_assessment_set_assessor a
LEFT JOIN yw_assessment_set b ON (a.assessment_set_id = b.id)
@@ -126,11 +126,8 @@
<if test="assessmentScore.scoreUserName != null and assessmentScore.scoreUserName != ''">
and a.user_name like concat('%', #{assessmentScore.scoreUserName}, '%')
</if>
- <if test="assessmentScore.deptName != null and assessmentScore.deptName != '' and assessmentScore.type != null and assessmentScore.type == 1">
- and d.dept_name like concat('%', #{assessmentScore.deptName}, '%')
- </if>
- <if test="assessmentScore.deptName != null and assessmentScore.deptName != '' and assessmentScore.type != null and assessmentScore.type == 0">
- and c.dept_name like concat('%', #{assessmentScore.deptName}, '%')
+ <if test="assessmentScore.deptName != null and assessmentScore.deptName != ''">
+ and b.dept_name like concat('%', #{assessmentScore.deptName}, '%')
</if>
</where>
</select>
--
Gitblit v1.9.3