From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +0800
Subject: [PATCH] 报名接口修改,考试计算成绩接口修改，对比答案修改为对比所有题目
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 226 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
index 2a98cfc..7b95dfd 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -5,9 +5,10 @@
<!--考试报名分页信息-->
<select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
- sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+ sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
- bu.real_name name
+ bu.real_name realName,bu.is_apply isApply,
+ bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
FROM
sys_apply sa
left join
@@ -18,10 +19,23 @@
blade_user bu
on
sa.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
WHERE
1=1
- <if test="apply.name!=null and apply.name!=''">
- and sa.name like concat('%', #{apply.name},'%')
+ and is_exam = 1
+ and sa.apply_status = 2
+ and bu.is_apply = 1
+ <if test="apply.realName!=null and apply.realName!=''">
+ and bu.real_name like concat('%', #{apply.realName},'%')
+ </if>
+ <if test="apply.deptName!=null and apply.deptName!=''">
+ and bd.dept_name like concat('%', #{apply.deptName},'%')
+ </if>
+ <if test="apply.userId!=null and apply.userId!=''">
+ and sa.user_id like concat('%', #{apply.userId},'%')
</if>
<if test="apply.applyStatus!=null">
and apply_status = #{apply.applyStatus}
@@ -37,13 +51,28 @@
<!--考试报名详情信息-->
<select id="selectApplyInfo" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
- *
+ sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+ ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
+ bu.real_name name,sa.examination_type,sa.examination_mx,
+ bd.dept_name deptName
FROM
- sys_apply
+ sys_apply sa
+ left join
+ ksxt_exam ke
+ on
+ sa.exam_id = ke.id
+ left join
+ blade_user bu
+ on
+ sa.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
WHERE
1=1
<if test="apply.id!=null">
- and id = #{apply.id}
+ and sa.id = #{apply.id}
</if>
</select>
@@ -55,4 +84,194 @@
and candidate_no like concat('%', #{result},'%')
</if>
</select>
+
+ <!--获取公司集体报名的人数-->
+ <select id="getApplyNum" resultType="java.lang.Integer">
+ select count(*) from sys_apply where apply_code = #{applyCode}
+ </select>
+
+ <!--获取准考证信息(正式考试)-->
+ <select id="getApplyInfo" resultType="org.springblade.modules.apply.vo.ApplyPaPerVO">
+ SELECT
+ sa.id,sa.candidate_no candidateNo,
+ ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName,
+ bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.my_picture myPicture,
+ bd.dept_name deptName,"保安证" applyCard
+ FROM
+ sys_apply sa
+ left join
+ ksxt_exam ke
+ on
+ sa.exam_id = ke.id
+ left join
+ blade_user bu
+ on
+ sa.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ WHERE
+ sa.id = #{apply.id}
+ </select>
+
+
+ <!--获取准考证信息(模拟考试)-->
+ <select id="getTrainApplyInfo" resultType="org.springblade.modules.apply.vo.ApplyPaPerVO">
+ select
+ sr.candidate_no candidateNo,
+ bt.dept_name AS deptName,"保安证" applyCard,
+ bu.real_name realName,bu.cardid idCardNo,ifnull(bu.sex,0) sex,bu.my_picture myPicture,
+ ke.exam_type examType,ke.start_time startTime,ke.end_time endTime,ke.exam_name examName
+ 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 sr.id = #{apply.id}
+ </select>
+
+ <!--导出报名清册数据-->
+ <select id="getApplyExcelList" resultType="org.springblade.modules.apply.excel.ApplyInfoExcel">
+ SELECT
+ sa.candidate_no candidateNo,sa.apply_time applyTime,
+ ke.start_time examTime,ke.exam_name examName,
+ bu.real_name realName,bu.cardid idCardNo,
+ bd.dept_name deptName,"保安证" applyCard
+ FROM
+ sys_apply sa
+ left join
+ ksxt_exam ke
+ on
+ sa.exam_id = ke.id
+ left join
+ blade_user bu
+ on
+ sa.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ WHERE
+ 1=1
+ and is_exam = 1
+ <if test="apply.name!=null and apply.name!=''">
+ and sa.name like concat('%', #{apply.name},'%')
+ </if>
+ <if test="apply.userId!=null and apply.userId!=''">
+ and sa.user_id like concat('%', #{apply.userId},'%')
+ </if>
+ <if test="apply.applyStatus!=null">
+ and apply_status = #{apply.applyStatus}
+ </if>
+ <if test="apply.applyExamType!=null">
+ and apply_exam_type = #{apply.applyExamType}
+ </if>
+ <if test="apply.examId!=null">
+ and sa.exam_id = #{apply.examId}
+ </if>
+ </select>
+
+
+ <!--查询人员是否已经报名-->
+ <select id="getIsApply" resultType="java.lang.Integer">
+ select 1 from sys_apply
+ where 1=1
+ and is_exam = 1
+ and user_id = #{apply.userId}
+ and exam_id = #{apply.examId}
+ and (apply_status = 1 or apply_status = 2)
+ limit 1
+ </select>
+
+ <!--查询人员是否已经报名-->
+ <select id="getSecurityApplyInfo" resultType="org.springblade.modules.apply.entity.Apply">
+ select * from sys_apply
+ where 1=1
+ and is_exam = 1
+ and user_id = #{apply.userId}
+ and apply_status = 2
+ limit 1
+ </select>
+
+ <!--查询报名人员未关联考试的ids集合-->
+ <select id="getApplyIds" resultType="java.lang.Long">
+ SELECT
+ sa.id
+ FROM
+ sys_apply sa
+ left join
+ blade_user bu
+ on
+ sa.user_id = bu.id
+ WHERE
+ 1=1
+ and is_exam = 1
+ and sa.apply_status = 2
+ and bu.is_apply = 1
+ and sa.exam_id is null
+ </select>
+
+ <!--查询考试人数-->
+ <select id="getApplyDeatailNum" resultType="java.lang.Integer">
+ SELECT
+ count(*)
+ FROM
+ sys_apply sa
+ left join
+ blade_user bu
+ on
+ sa.user_id = bu.id
+ WHERE
+ 1=1
+ and is_exam = 1
+ and sa.apply_status = 2
+ and bu.is_apply = 1
+ and sa.exam_id is not null
+ </select>
+
+ <!--查询已报名的的人信息集合-->
+ <select id="getApplyDetailList" resultType="org.springblade.modules.apply.vo.ApplyVO">
+ SELECT
+ sa.candidate_no candidateNo,sa.apply_time applyTime,
+ ke.exam_name examName,
+ bu.real_name realName,bu.cardid idCardNo,bu.sex,
+ bd.dept_name deptName,"保安证" applyCard
+ FROM
+ sys_apply sa
+ left join
+ blade_user bu
+ on
+ sa.user_id = bu.id
+ left join
+ ksxt_exam ke
+ on
+ ke.id = sa.exam_id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ WHERE
+ 1=1
+ and is_exam = 1
+ and sa.apply_status = 2
+ and bu.is_apply = 1
+ and sa.exam_id is not null
+ </select>
+
</mapper>
--
Gitblit v1.9.3