From b51e8bc94eee7074da1ea3457d5d574f4887572d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 31 Jul 2021 17:58:55 +0800
Subject: [PATCH] 新增字段，新增查询考试人员信息接口
---
src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java | 11 +++
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 8 +-
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.java | 7 ++
src/main/java/org/springblade/modules/exam/service/ExamPaperService.java | 7 ++
src/main/java/org/springblade/modules/training/mapper/TrainExamMapper.xml | 12 +++-
src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java | 12 ++++
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 14 ++++
src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml | 39 +++++++++++++
src/main/java/org/springblade/modules/apply/entity/Apply.java | 6 ++
src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java | 20 ++++++
10 files changed, 128 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/entity/Apply.java b/src/main/java/org/springblade/modules/apply/entity/Apply.java
index e28bfb0..5bda2fe 100644
--- a/src/main/java/org/springblade/modules/apply/entity/Apply.java
+++ b/src/main/java/org/springblade/modules/apply/entity/Apply.java
@@ -170,4 +170,10 @@
*/
@TableField("apply_code")
private String applyCode;
+
+ /**
+ * 是否考试 1:报名未考 2：已考
+ */
+ @TableField("is_exam")
+ private Integer isExam;
}
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index 49ff4e3..42bc085 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -192,4 +192,18 @@
return R.status(examPaperService.UnbindSubject(paperid,subjectid));
}
+
+
+ /**
+ * 查询考生考试信息
+ * @param userId 用户id
+ * @return
+ */
+ @GetMapping("/getExamDetail")
+ public R getExamDetail(String userId){
+ return R.data(examPaperService.getExamDetail(userId));
+ }
+
+
+
}
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.java b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.java
index 5c4f7da..82cadc7 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.java
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.java
@@ -50,4 +50,11 @@
List<ExamPaper> selectExamPaperPageTree(@Param("paper") ExamPaper examPaper);
boolean UnbindSubject(String paperid, String subjectid);
+
+ /**
+ * 查询考生考试信息
+ * @param userId 用户id
+ * @return
+ */
+ List<ExamPaperVO> getExamDetail(String userId);
}
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
index afb4988..390e757 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml
@@ -128,4 +128,43 @@
delete from exam_examination_subject where examination_id = #{paperid} and subject_id = #{subjectid}
</delete>
+ <!--查询考试人员考试信息-->
+ <select id="getExamDetail" resultType="org.springblade.modules.exam.vo.ExamPaperVO">
+ (select
+ ke.id,ke.exam_name examName,
+ sa.candidate_no candidateNo,
+ bu.real_name realName,bu.sex
+ from
+ ksxt_exam ke
+ left join
+ sys_apply sa
+ on
+ sa.exam_id = ke.id
+ left join
+ blade_user bu
+ on
+ bu.id = sa.user_id
+ where sa.user_id = #{userId}
+ and is_exam = 1)
+
+ union all
+
+ (select
+ ke.id,ke.exam_name examName,
+ str.candidate_no candidateNo,
+ bu.real_name realName,bu.sex
+ from
+ ksxt_exam ke
+ left join
+ sys_training_registration str
+ on
+ str.train_exam_id = ke.id
+ left join
+ blade_user bu
+ on
+ bu.id = str.user_id
+ where str.user_id = #{userId}
+ and is_exam = 1)
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/exam/service/ExamPaperService.java b/src/main/java/org/springblade/modules/exam/service/ExamPaperService.java
index 1700284..675ba8d 100644
--- a/src/main/java/org/springblade/modules/exam/service/ExamPaperService.java
+++ b/src/main/java/org/springblade/modules/exam/service/ExamPaperService.java
@@ -58,4 +58,11 @@
* 解除试卷和题目的绑定
*/
boolean UnbindSubject(String paperid,String subjectid);
+
+ /**
+ * 查询考生考试信息
+ * @param userId 用户id
+ * @return
+ */
+ List<ExamPaperVO> getExamDetail(String userId);
}
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
index e584bdb..ccf3e4f 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamPaperServiceImpl.java
@@ -76,4 +76,15 @@
return baseMapper.UnbindSubject(paperid,subjectid);
}
+
+ /**
+ * 查询考生考试信息
+ * @param userId 用户id
+ * @return
+ */
+ @Override
+ public List<ExamPaperVO> getExamDetail(String userId) {
+ //查询考试信息
+ return baseMapper.getExamDetail(userId);
+ }
}
diff --git a/src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java b/src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java
index 2a411c4..7dead06 100644
--- a/src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java
+++ b/src/main/java/org/springblade/modules/exam/vo/ExamPaperVO.java
@@ -5,12 +5,30 @@
import org.springblade.modules.exam.entity.ExamPaper;
/**
- * 通知公告视图类
+ * 考试类
*
* @author Chill
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ExamPaperVO extends ExamPaper {
+ /**
+ * 考试人员姓名
+ */
+ private String realName;
+ /**
+ * 身份证号
+ */
+ private String idCardNo;
+
+ /**
+ * 准考证号
+ */
+ private String candidateNo;
+
+ /**
+ * 性别 1 男 2 女
+ */
+ private Integer sex;
}
diff --git a/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java b/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
index 8c780a6..ad170fb 100644
--- a/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
+++ b/src/main/java/org/springblade/modules/training/entity/TrainingRegistration.java
@@ -103,4 +103,16 @@
@TableField("user_id")
private String userId;
+ /**
+ * 是否考试 1:报名未考 2：已考
+ */
+ @TableField("is_exam")
+ private Integer isExam;
+
+ /**
+ * 准考证号
+ */
+ @TableField("candidate_no")
+ private String candidateNo;
+
}
diff --git a/src/main/java/org/springblade/modules/training/mapper/TrainExamMapper.xml b/src/main/java/org/springblade/modules/training/mapper/TrainExamMapper.xml
index 90c2363..289264d 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainExamMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainExamMapper.xml
@@ -49,13 +49,19 @@
<!--自定义树-->
<select id="selectTrainExamPageTree" resultType="org.springblade.modules.training.entity.TrainExam">
select
- id,train_exam_name trainExamName
+ ke.id,ke.exam_name trainExamName
from
- sys_train_exam
+ ksxt_exam ke
+ left join
+ sys_train_exam ste
+ on
+ ke.train_exam_id = ste.id
where
1=1
+ and ste.audit_status = 1
+ and ke.exam_type = 2
<if test="trainExam.trainExamName!=null and trainExam.trainExamName!=''">
- and sr.train_exam_name like concat('%', #{trainExam.trainExamName},'%')
+ and ske.exam_name like concat('%', #{trainExam.trainExamName},'%')
</if>
</select>
</mapper>
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 ccd7cd0..fede603 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -9,7 +9,7 @@
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
bu.real_name realName,bu.phone,bu.cardid idCardNo,
- ste.start_time trainExamTime,ste.train_exam_name trainExamName
+ ke.start_time trainExamTime,ke.exam_name trainExamName
FROM
sys_training_registration sr
LEFT JOIN
@@ -25,13 +25,13 @@
on
sr.user_id = bu.id
left join
- sys_train_exam ste
+ ksxt_exam ke
on
- ste.id = sr.train_exam_id
+ ke.id = sr.train_exam_id
WHERE
1=1
<if test="trainingRegistration.trainingUnitId!=null and trainingRegistration.trainingUnitId!=''">
- and ste.dept_id = #{trainingRegistration.trainingUnitId}
+ and sr.training_unit_id = #{trainingRegistration.trainingUnitId}
</if>
<if test="trainingRegistration.deptName!=null and trainingRegistration.deptName!=''">
and bt.dept_name like concat('%', #{trainingRegistration.deptName},'%')
--
Gitblit v1.9.3