From e79c1b0d5deb09bd49b4c19d6fb80b5ba5abf23f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 04 Dec 2021 16:26:10 +0800
Subject: [PATCH] app接口调整
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index f0c786d..b7b2970 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -155,7 +155,7 @@
<!-- exam_score exam-->
<!-- LEFT JOIN blade_user user ON exam.user_id = user.id-->
<!-- WHERE 1 = 1-->
-<!-- <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">-->
+<!-- <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1372091709474910209'">-->
<!-- AND user.jurisdiction = #{jurisdiction}-->
<!-- </if>-->
<!-- <if test="deptid!=null and deptid==''">-->
@@ -171,7 +171,7 @@
<!-- exam_score exam-->
<!-- LEFT JOIN blade_user user ON exam.user_id = user.id-->
<!-- WHERE 1 = 1-->
-<!-- <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">-->
+<!-- <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1372091709474910209'">-->
<!-- AND user.jurisdiction = #{jurisdiction}-->
<!-- </if>-->
<!-- <if test="deptid!=null and deptid==''">-->
@@ -189,7 +189,7 @@
exam_score exam
LEFT JOIN blade_user user ON exam.user_id = user.id
WHERE 1 = 1 AND theory_grade is not null
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
AND user.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -207,7 +207,7 @@
exam_score exam
LEFT JOIN blade_user user ON exam.user_id = user.id
WHERE 1 = 1 AND learn_grade is not null
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
AND user.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -221,17 +221,35 @@
SELECT
exam.*,
user.jurisdiction,
- user.dept_id
+ user.dept_id,
+ user.real_name realName,
+ ke.exam_name examName
FROM
exam_score exam
- LEFT JOIN blade_user user ON exam.user_id = user.id
+ LEFT JOIN blade_user user
+ ON exam.user_id = user.id
+ left join
+ ksxt_exam ke
+ on
+ ke.id = exam.exam_id
+ left join
+ sys_information si
+ on
+ user.dept_id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
WHERE
1 = 1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- AND user.jurisdiction = #{jurisdiction}
+ <if test="realName!=null and realName!=''">
+ AND user.real_name = #{realName}
+ </if>
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ AND (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
- AND user.dept_id = #{deptid}
+ AND user.dept_id = #{deptid}
</if>
</select>
--
Gitblit v1.9.3