From 567775c8ef9761b5fe5d04073ca329b7ef30e22d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 16:00:14 +0800
Subject: [PATCH] 第一轮结果导出

---
 src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 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 553a34d..7e90a4b 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
@@ -30,23 +30,32 @@
 
     <select id="selectAssessmentScoreGroupByBeidPage" resultMap="assessmentScoreResultMap">
         select a.id,a.assessment_task_id,a.be_id,a.score_user_id,SUM(a.weight*a.score_val*0.01) as score_val,a.type from yw_assessment_score a
-        LEFT JOIN blade_user b on (a.be_id = b.id)
-        LEFT JOIN blade_dept c on (a.be_id = c.id)
-    <where>
-        <if test="assessmentScore.type != null and assessmentScore.type != ''">
-            and a.type = #{assessmentScore.type}
+        <if test="assessmentScore.type != null and assessmentScore.type == 0">
+            LEFT JOIN blade_user b on (a.be_id = b.id)
+            left join blade_dept c on b.dept_id = c.id
         </if>
-        <if test="assessmentScore.assessmentTaskId != null and assessmentScore.assessmentTaskId != ''">
-            and a.assessment_task_id = #{assessmentScore.assessmentTaskId}
+        <if test="assessmentScore.type != null and assessmentScore.type == 1">
+            left join blade_dept c on a.be_id = c.id
         </if>
-        <if test="assessmentScore.userName != null and assessmentScore.userName != ''">
-            and b.name like concat('%', #{assessmentScore.userName},'%')
-        </if>
-        <if test="assessmentScore.deptName != null and assessmentScore.deptName != ''">
-            and c.dept_name like concat('%', #{assessmentScore.deptName},'%')
-        </if>
-    </where>
-    group by a.be_id
+
+        <where>
+            <if test="assessmentScore.type != null and assessmentScore.type != ''">
+                and a.type = #{assessmentScore.type}
+            </if>
+            <if test="assessmentScore.assessmentTaskId != null and assessmentScore.assessmentTaskId != ''">
+                and a.assessment_task_id = #{assessmentScore.assessmentTaskId}
+            </if>
+            <if test="assessmentScore.userName != null and assessmentScore.userName != ''">
+                and b.name like concat('%', #{assessmentScore.userName},'%')
+            </if>
+            <if test="assessmentScore.deptId != null and assessmentScore.deptId != ''">
+                and c.id = #{assessmentScore.deptId}
+            </if>
+            <if test="assessmentScore.deptName != null and assessmentScore.deptName != ''">
+                and c.dept_name like concat('%', #{assessmentScore.deptName},'%')
+            </if>
+        </where>
+        group by a.be_id
     </select>
 
 

--
Gitblit v1.9.3