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 |  221 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 176 insertions(+), 45 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 8a03685..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,31 +8,22 @@
             sr.*,
             bt.dept_name AS deptName,
             bt0.dept_name AS trainUnitName,
-            bu.real_name realName,bu.phone,bu.cardid idCardNo,
+            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
             1=1
-        <if test="trainingRegistration.isExam!=null">
+        <if test="trainingRegistration.isExam!=null and trainingRegistration.isExam!=0">
             and is_exam = #{trainingRegistration.isExam}
         </if>
         <if test="trainingRegistration.trainingUnitId!=null and  trainingRegistration.trainingUnitId!=''">
@@ -44,11 +35,17 @@
         <if test="trainingRegistration.userId!=null and  trainingRegistration.userId!=''">
             and sr.user_id = #{trainingRegistration.userId}
         </if>
+        <if test="trainingRegistration.unitName!=null and  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}
         </if>
         <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
             and sr.audit_status = #{trainingRegistration.auditStatus}
+        </if>
+        <if test="trainingRegistration.vipStatus!=null and trainingRegistration.vipStatus!=0">
+            and sr.vip_status = #{trainingRegistration.vipStatus}
         </if>
         <if test="trainingRegistration.deptName!=null and  trainingRegistration.deptName!=''">
             and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
@@ -56,12 +53,19 @@
         <if test="trainingRegistration.realName!=null and  trainingRegistration.realName!=''">
             and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
         </if>
-        <if test="trainingRegistration.cancel!=null">
+        <if test="trainingRegistration.idCardNo!=null and  trainingRegistration.idCardNo!=''">
+            and bu.cardid like concat('%', #{trainingRegistration.idCardNo},'%')
+        </if>
+        <if test="trainingRegistration.cancel!=null and trainingRegistration.cancel!=0">
             and sr.cancel = #{trainingRegistration.cancel}
         </if>
         <if test="trainingRegistration.isTrain!=null">
             and bu.is_train = #{trainingRegistration.isTrain}
         </if>
+        <if test="trainingRegistration.jurisdiction!=null and trainingRegistration.jurisdiction!='' and trainingRegistration.jurisdiction!='1372091709474910209'">
+            and (sj.id=#{trainingRegistration.jurisdiction} or sj.parent_id = #{trainingRegistration.jurisdiction})
+        </if>
+        order by sr.id desc
     </select>
 
     <!--报名培训详情信息-->
@@ -82,33 +86,38 @@
     </select>
 
     <!--导出报名数数据-->
-    <select id="getTrainingRegistrationExcelList" resultType="org.springblade.modules.apply.excel.ApplyInfoExcel">
-        select
-            sr.training_time applyTime,sr.candidate_no candidateNo,
-            bt.dept_name AS deptName,"保安证" applyCard,
-            bu.real_name realName,bu.cardid idCardNo,
-            ke.start_time examTime,ke.exam_name examName
+    <select id="getTrainingRegistrationExcelList" resultType="org.springblade.modules.training.excel.TrainingRegistrationExcel">
+        SELECT
+        sr.id,
+        sr.candidate_no candidateNo,
+        sr.training_time trainingTime,
+        case
+            when sr.is_exam = 1 then "未考试"
+            when sr.is_exam = 2 then "考试结束"
+            when sr.is_exam = 3 then "考试中"
+        else "缺考" end as isExam,
+        bt.dept_name AS deptName,
+        bt0.dept_name AS trainUnitName,
+        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
+            when sr.audit_status = 1 then "审核通过"
+            when sr.audit_status = 2 then "审核不通过"
+            when sr.audit_status = 3 then "已提交审核"
+        else "未提交审核" end as auditStatus,
+        "保安证" applyCard
         FROM
         sys_training_registration sr
-        LEFT JOIN
-        blade_dept bt
-        ON
-        sr.dept_id = bt.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
-        ksxt_exam ke
-        on
-        ke.id = sr.train_exam_id
-        WHERE
-        1=1
-        and is_exam = 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>
         <if test="trainingRegistration.trainingUnitId!=null and  trainingRegistration.trainingUnitId!=''">
             and sr.training_unit_id = #{trainingRegistration.trainingUnitId}
         </if>
@@ -118,15 +127,31 @@
         <if test="trainingRegistration.userId!=null and  trainingRegistration.userId!=''">
             and sr.user_id = #{trainingRegistration.userId}
         </if>
+        <if test="trainingRegistration.deptId!=null and  trainingRegistration.deptId!=''">
+            and bu.dept_id = #{trainingRegistration.deptId}
+        </if>
+        <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
+            and sr.audit_status = #{trainingRegistration.auditStatus}
+        </if>
         <if test="trainingRegistration.deptName!=null and  trainingRegistration.deptName!=''">
             and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
+        </if>
+        <if test="trainingRegistration.unitName!=null and  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},'%')
         </if>
-        <if test="trainingRegistration.cancel!=null">
+        <if test="trainingRegistration.idCardNo!=null and  trainingRegistration.idCardNo!=''">
+            and bu.cardid like concat('%', #{trainingRegistration.idCardNo},'%')
+        </if>
+        <if test="trainingRegistration.cancel!=null and trainingRegistration.cancel!=0">
             and sr.cancel = #{trainingRegistration.cancel}
         </if>
+        <if test="trainingRegistration.isTrain!=null">
+            and bu.is_train = #{trainingRegistration.isTrain}
+        </if>
+        order by sr.id desc
     </select>
 
 
@@ -207,4 +232,110 @@
         </if>
         limit #{trainingRegistration.serialStart},#{trainingRegistration.serialEnd}
     </select>
+
+    <!--报名培训分页信息-->
+    <select id="selectTrainingRegistrationList" resultType="org.springblade.modules.training.entity.TrainingRegistration">
+        SELECT
+        sr.*
+        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
+        and bu.is_deleted = 0
+        and bu.status = 1
+        <if test="trainingRegistration.isExam!=null">
+            and is_exam = #{trainingRegistration.isExam}
+        </if>
+        <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
+            and sr.audit_status = #{trainingRegistration.auditStatus}
+        </if>
+        <if test="trainingRegistration.cancel!=null">
+            and sr.cancel = #{trainingRegistration.cancel}
+        </if>
+    </select>
+
+
+    <!--查询报名集合信息-->
+    <select id="getList" resultType="org.springblade.modules.training.vo.TrainingRegistrationVo">
+        SELECT
+        sr.*
+        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 sys_information si on si.departmentid = bt.id
+        left join sys_jurisdiction sj on si.jurisdiction = sj.id
+        WHERE
+        1=1
+        <if test="trainingRegistration.isExam!=null and trainingRegistration.isExam!=0">
+            and is_exam = #{trainingRegistration.isExam}
+        </if>
+        <if test="trainingRegistration.trainingUnitId!=null and  trainingRegistration.trainingUnitId!=''">
+            and sr.training_unit_id = #{trainingRegistration.trainingUnitId}
+        </if>
+        <if test="trainingRegistration.examId!=null and  trainingRegistration.examId!=''">
+            and ke.id = #{trainingRegistration.examId}
+        </if>
+        <if test="trainingRegistration.userId!=null and  trainingRegistration.userId!=''">
+            and sr.user_id = #{trainingRegistration.userId}
+        </if>
+        <if test="trainingRegistration.deptId!=null and  trainingRegistration.deptId!=''">
+            and bu.dept_id = #{trainingRegistration.deptId}
+        </if>
+        <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
+            and sr.audit_status = #{trainingRegistration.auditStatus}
+        </if>
+        <if test="trainingRegistration.vipStatus!=null and trainingRegistration.vipStatus!=0">
+            and sr.vip_status = #{trainingRegistration.vipStatus}
+        </if>
+        <if test="trainingRegistration.deptName!=null and  trainingRegistration.deptName!=''">
+            and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
+        </if>
+        <if test="trainingRegistration.realName!=null and  trainingRegistration.realName!=''">
+            and bu.real_name like concat('%', #{trainingRegistration.realName},'%')
+        </if>
+        <if test="trainingRegistration.idCardNo!=null and  trainingRegistration.idCardNo!=''">
+            and bu.cardid like concat('%', #{trainingRegistration.idCardNo},'%')
+        </if>
+        <if test="trainingRegistration.cancel!=null and trainingRegistration.cancel!=0">
+            and sr.cancel = #{trainingRegistration.cancel}
+        </if>
+        <if test="trainingRegistration.isTrain!=null">
+            and bu.is_train = #{trainingRegistration.isTrain}
+        </if>
+        <if test="trainingRegistration.jurisdiction!=null and trainingRegistration.jurisdiction!='' and trainingRegistration.jurisdiction!='1372091709474910209'">
+            and (sj.id=#{trainingRegistration.jurisdiction} or sj.parent_id = #{trainingRegistration.jurisdiction})
+        </if>
+        order by sr.id desc
+    </select>
 </mapper>

--
Gitblit v1.9.3