From aa177f570c4a9dd2f30dada820b6afcb87ebff42 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 09 Dec 2023 08:47:31 +0800
Subject: [PATCH] 培训考试查询修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 53 +++++++-------------------
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 8 ++--
2 files changed, 19 insertions(+), 42 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 67f3d35..4d672ae 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -288,24 +288,24 @@
<select id="scorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
SELECT
exam.*,
- user.jurisdiction,user.real_name securityName,user.unit_name unitName,
+ user.jurisdiction,user.real_name securityName,bud.unit_name unitName,
ke.exam_name examName,sis.enterpriseName trainingUnitName,ke.start_time examStartTime
FROM
exam_score exam
left join blade_user user on exam.user_id = user.id
+ left join blade_user_detail bud on bud.user_id = user.id
left join sys_information si on si.departmentid = user.dept_id
left join sys_jurisdiction sj on sj.id = si.jurisdiction
left join ksxt_exam ke on exam.exam_id = ke.id
left join sys_training_registration str on str.id = exam.apply_id
left join sys_information sis on sis.departmentid = str.training_unit_id
- WHERE
- 1 = 1
+ WHERE 1 = 1
and ke.exam_type = 2 and exam.is_deleted = 0
<if test="examScore.jurisdiction!=null and examScore.jurisdiction!='' and examScore.jurisdiction!='1372091709474910209'">
and (sj.id = #{examScore.jurisdiction} or sj.parent_id = #{examScore.jurisdiction})
</if>
<if test="examScore.unitName!=null and examScore.unitName!=''">
- and bu.unit_name like concat('%', #{examScore.unitName},'%')
+ and bud.unit_name like concat('%', #{examScore.unitName},'%')
</if>
<if test="examScore.securityName!=null and examScore.securityName!=''">
AND user.real_name like concat('%',#{examScore.securityName},'%')
diff --git a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
index c0918be..b8e85c4 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -8,28 +8,17 @@
sr.*,
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
- bu.real_name realName,bu.phone,bu.cardid idCardNo,bu.unit_name unitName,
+ bu.real_name realName,bu.phone,bu.cardid idCardNo,bud.unit_name unitName,
ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,
ke.exam_type examType,sr.audit_status auditStatus,
"保安证" applyCard
FROM
sys_training_registration sr
- LEFT JOIN
- blade_dept bt0
- ON
- sr.training_unit_id = bt0.id
- left join
- blade_user bu
- on
- sr.user_id = bu.id
- LEFT JOIN
- blade_dept bt
- ON
- bu.dept_id = bt.id
- left join
- ksxt_exam ke
- on
- ke.id = sr.train_exam_id
+ LEFT JOIN blade_dept bt0 ON sr.training_unit_id = bt0.id
+ left join blade_user bu on sr.user_id = bu.id
+ left join blade_user_detail bud on bud.user_id = bu.id
+ LEFT JOIN blade_dept bt ON bu.dept_id = bt.id
+ left join ksxt_exam ke on ke.id = sr.train_exam_id
left join sys_information si on si.departmentid = bt.id
left join sys_jurisdiction sj on si.jurisdiction = sj.id
WHERE
@@ -47,7 +36,7 @@
and sr.user_id = #{trainingRegistration.userId}
</if>
<if test="trainingRegistration.unitName!=null and trainingRegistration.unitName!=''">
- and bu.unit_name like concat('%', #{trainingRegistration.unitName},'%')
+ and bud.unit_name like concat('%', #{trainingRegistration.unitName},'%')
</if>
<if test="trainingRegistration.deptId!=null and trainingRegistration.deptId!=''">
and bu.dept_id = #{trainingRegistration.deptId}
@@ -109,7 +98,7 @@
else "缺考" end as isExam,
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
- bu.real_name realName,bu.phone,bu.cardid idCardNo,bu.unit_name unitName,
+ bu.real_name realName,bu.phone,bu.cardid idCardNo,bud.unit_name unitName,
ke.start_time trainExamTime,
if(ke.audit_status=1,ke.exam_name,"") trainExamName,
case
@@ -120,24 +109,12 @@
"保安证" applyCard
FROM
sys_training_registration sr
- LEFT JOIN
- blade_dept bt0
- ON
- sr.training_unit_id = bt0.id
- left join
- blade_user bu
- on
- sr.user_id = bu.id
- LEFT JOIN
- blade_dept bt
- ON
- bu.dept_id = bt.id
- left join
- ksxt_exam ke
- on
- ke.id = sr.train_exam_id
- WHERE
- 1=1
+ LEFT JOIN blade_dept bt0 ON sr.training_unit_id = bt0.id
+ left join blade_user bu on sr.user_id = bu.id
+ left join blade_user_detail bud on bud.user_id = bu.id
+ LEFT JOIN blade_dept bt ON bu.dept_id = bt.id
+ left join ksxt_exam ke on ke.id = sr.train_exam_id
+ WHERE 1=1
<if test="trainingRegistration.isExam!=null and trainingRegistration.isExam!=0">
and is_exam = #{trainingRegistration.isExam}
</if>
@@ -160,7 +137,7 @@
and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
</if>
<if test="trainingRegistration.unitName!=null and trainingRegistration.unitName!=''">
- and bu.unit_name like concat('%', #{trainingRegistration.unitName},'%')
+ and bud.unit_name like concat('%', #{trainingRegistration.unitName},'%')
</if>
<if test="trainingRegistration.realName!=null and trainingRegistration.realName!=''">
and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
--
Gitblit v1.9.3