From 00c66882f4f25f8b3e6aa86579ad286a477bceaa Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 30 Nov 2023 16:50:33 +0800
Subject: [PATCH] 模拟考试成绩查询
---
src/main/java/org/springblade/modules/simulateexam/vo/SimulateExamRecordVO.java | 7 +++++++
src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java | 24 ++++++++++++------------
src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.xml | 14 +++++++++++++-
src/main/java/org/springblade/modules/simulateexam/entity/SimulateExamRecord.java | 3 +++
4 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/simulateexam/entity/SimulateExamRecord.java b/src/main/java/org/springblade/modules/simulateexam/entity/SimulateExamRecord.java
index bb04a0e..fe32b4b 100644
--- a/src/main/java/org/springblade/modules/simulateexam/entity/SimulateExamRecord.java
+++ b/src/main/java/org/springblade/modules/simulateexam/entity/SimulateExamRecord.java
@@ -69,4 +69,7 @@
* 答题时长,以毫秒为单位
*/
private Long answerTime;
+
+ //手机号
+ private String phone;
}
diff --git a/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.xml b/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.xml
index 52ba575..519feb2 100644
--- a/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.xml
@@ -4,11 +4,23 @@
<!--自定义查询模拟考试记录分页数据-->
<select id="selectSimulateExamRecordPage" resultType="org.springblade.modules.simulateexam.vo.SimulateExamRecordVO">
- select * from simulate_exam_record
+ SELECT ser.*,bu.real_name as userName,bd.dept_name as deptName FROM simulate_exam_record ser
+ LEFT JOIN blade_user bu ON bu.phone = ser.phone
+ LEFT JOIN blade_dept bd ON bd.id = bu.dept_id
where 1=1
+ <if test="simulateExamRecord.phone != null and simulateExamRecord.phone != ''" >
+ and ser.phone LIKE CONCAT('%',#{simulateExamRecord.phone},'%')
+ </if>
<if test="simulateExamRecord.idCardNo!=null and simulateExamRecord.idCardNo!=''">
and id_card_no=#{simulateExamRecord.idCardNo}
</if>
+ <if test="simulateExamRecord.deptId!=null and simulateExamRecord.deptId!=''">
+ AND bu.dept_id = #{simulateExamRecord.deptId}
+ </if>
+ <if test="simulateExamRecord.userName != null and simulateExamRecord.userName !='' ">
+ AND bu.real_name LIKE CONCAT('%',#{simulateExamRecord.userName},'%')
+ </if>
+ ORDER BY ser.start_time DESC
</select>
diff --git a/src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java b/src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java
index 19b9c38..90e909a 100644
--- a/src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java
@@ -164,18 +164,18 @@
*/
@Override
public Object insertSimulateExamRecord(SimulateExamRecord simulateExamRecord) {
- //创建返回信息map
+// //创建返回信息map
Map<String, Object> map = new HashMap<>();
- //使用身份证号码匹配人员信息(user_id)
- User user = new User();
- user.setIsDeleted(0);
- user.setStatus(1);
- user.setCardid(simulateExamRecord.getIdCardNo());
- List<User> list = userService.list(Condition.getQueryWrapper(user));
+// //使用身份证号码匹配人员信息(user_id)
+// User user = new User();
+// user.setIsDeleted(0);
+// user.setStatus(1);
+// user.setCardid(simulateExamRecord.getIdCardNo());
+// List<User> list = userService.list(Condition.getQueryWrapper(user));
List<ExamSubjectChoicesVO> choicesVOList = new ArrayList<>();
boolean status = false;
- if (list.size()>0){
- User user1 = list.get(0);
+// if (list.size()>0){
+// User user1 = list.get(0);
//从大题库随机抽取100道题目
choicesVOList = examPaperService.simulateQueryRandomSubjectList();
//取出考试id
@@ -203,9 +203,9 @@
//返回信息
return map;
}
- }else {
- throw new ServiceException("未查询到该人员信息");
- }
+// }else {
+// throw new ServiceException("未查询到该人员信息");
+// }
//返回数据
return map;
}
diff --git a/src/main/java/org/springblade/modules/simulateexam/vo/SimulateExamRecordVO.java b/src/main/java/org/springblade/modules/simulateexam/vo/SimulateExamRecordVO.java
index 88f7b9a..2f92281 100644
--- a/src/main/java/org/springblade/modules/simulateexam/vo/SimulateExamRecordVO.java
+++ b/src/main/java/org/springblade/modules/simulateexam/vo/SimulateExamRecordVO.java
@@ -17,4 +17,11 @@
* 1: 继续考试 2: 放弃之前的考试,重新生成题目考试
*/
private Integer type;
+
+ private String deptId;
+
+ private String userName;
+
+ private String userDeptName;
+
}
--
Gitblit v1.9.3