From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 18 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 2ef898b..5eae6aa 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -2,35 +2,37 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.modules.exam.mapper.ExamScoreMapper">
- <!--考试成绩分页信息-->
+ <!--考试成绩分页信息-正式考试-->
<select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
SELECT
- es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
- es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
- ke.exam_name examName,
- bu.real_name securityName,company,bu.account,
- sa.is_exam isExam,
- bd.dept_name companyName
+ es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
+ es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
+ ke.exam_name examName,
+ bu.real_name securityName,company,bu.account,
+ sa.is_exam isExam,
+ bd.dept_name companyName
FROM
- exam_score es
+ sys_apply sa
left join
- blade_user bu
+ blade_user bu
on
- es.user_id = bu.id
+ sa.user_id = bu.id
left join
- blade_dept bd
+ blade_dept bd
on
- bd.id = es.company
+ bd.id = bu.dept_id
left join
- ksxt_exam ke
+ ksxt_exam ke
on
- ke.id = es.exam_id
+ ke.id = sa.exam_id
left join
- sys_apply sa
+ exam_score es
on
- sa.user_id = bu.id
- WHERE
- 1=1
+ es.exam_id = sa.exam_id
+ where
+ 1=1
+ and (sa.is_exam = 2 or sa.is_exam = 3)
+ and ke.exam_type = 1
<if test="examScore.examName!=null and examScore.examName!=''">
and ke.exam_name like concat('%', #{examScore.examName},'%')
</if>
@@ -57,6 +59,63 @@
</if>
</select>
+
+ <!--考试成绩分页信息-模拟考试-->
+ <select id="selectTrainExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
+ SELECT
+ es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
+ es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,
+ ke.exam_name examName,
+ bu.real_name securityName,company,bu.account,
+ str.is_exam isExam,
+ bd.dept_name companyName
+ FROM
+ sys_training_registration str
+ left join
+ blade_user bu
+ on
+ str.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ left join
+ ksxt_exam ke
+ on
+ ke.id = str.train_exam_id
+ left join
+ exam_score es
+ on
+ es.exam_id = str.train_exam_id
+ WHERE
+ 1=1
+ and (str.is_exam = 2 or str.is_exam = 3)
+ <if test="examScore.examName!=null and examScore.examName!=''">
+ and ke.exam_name like concat('%', #{examScore.examName},'%')
+ </if>
+ <if test="examScore.companyName!=null and examScore.companyName!=''">
+ and bd.dept_name like concat('%', #{examScore.companyName},'%')
+ </if>
+ <if test="examScore.securityName!=null and examScore.securityName!=''">
+ and bu.real_name like concat('%', #{examScore.securityName},'%')
+ </if>
+ <if test="examScore.userId!=null and examScore.userId!=''">
+ and es.user_id = #{examScore.userId}
+ </if>
+ <if test="examScore.isExam!=null and examScore.isExam!=''">
+ and str.is_exam = #{examScore.isExam}
+ </if>
+ <if test="examScore.examType!=null and examScore.examType!=''">
+ and ke.exam_type = #{examScore.examType}
+ </if>
+ <if test="examScore.candidateNo!=null and examScore.candidateNo!=''">
+ and es.candidate_no = #{examScore.candidateNo}
+ </if>
+ <if test="examScore.qualified!=null">
+ and es.qualified = #{examScore.qualified}
+ </if>
+ </select>
+
<!--考试成绩详情信息-->
<select id="selectExamScoreInfo" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
SELECT
--
Gitblit v1.9.3