From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 53 +++++++++++++++--------------------------------------
1 files changed, 15 insertions(+), 38 deletions(-)
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