From 8e8c3113eea4c29a6c5a23ca35c4d460e81f3465 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Thu, 24 Feb 2022 09:47:03 +0800
Subject: [PATCH] 暂停模拟考试后,继续考试修改,状态修改为考试中,题目查询按本次模拟考试题目排序,接口放行
---
src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java | 6 ++++--
src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java | 9 +++++++--
src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.java | 2 +-
src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.xml | 5 +++++
src/main/resources/application.yml | 7 ++++++-
5 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.java b/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.java
index a446b94..e578a13 100644
--- a/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.java
+++ b/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.java
@@ -32,5 +32,5 @@
* @param list 题目id 集合
* @return
*/
- List<ExamSubjectChoicesVO> getSimulateExamRefreshList(@Param("list") List<String> list);
+ List<ExamSubjectChoicesVO> getSimulateExamRefreshList(@Param("list") List<Long> list);
}
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 9ddef03..c8072fa 100644
--- a/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/simulateexam/mapper/SimulateExamRecordMapper.xml
@@ -27,6 +27,11 @@
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
+ order by field(id,
+ <foreach collection="list" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ )
</select>
</mapper>
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 9a63c4a..ace7770 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
@@ -177,13 +177,18 @@
//其他信息
SimulateExamRecord simulateExamRecord1 = this.getById(simulateExamRecord.getId());
List<String> list = Arrays.asList(simulateExamRecord1.getSubjectIds().split(","));
+ List<Long> list1 = new ArrayList<>();
+ //装换为Long 类型,不然返回的题目顺序会乱
+ for (String s : list) {
+ list1.add(Long.parseLong(s));
+ }
//修改信息,修改回考试中的状态
- simulateExamRecord1.setStatus(2);
+ simulateExamRecord1.setStatus(1);
this.updateById(simulateExamRecord1);
//1.查询当前人员当前模拟考试的考试题目信息
- List<ExamSubjectChoicesVO> examSubjectChoicesVOSList = baseMapper.getSimulateExamRefreshList(list);
+ List<ExamSubjectChoicesVO> examSubjectChoicesVOSList = baseMapper.getSimulateExamRefreshList(list1);
//2.查询当前人员已答的题目信息
SimulateExamAnswerRecord simulateExamAnswerRecord = new SimulateExamAnswerRecord();
diff --git a/src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java b/src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java
index b871f22..4d8b212 100644
--- a/src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java
+++ b/src/main/java/org/springblade/modules/vip/service/impl/UserVipServiceImpl.java
@@ -88,12 +88,14 @@
user.setIsDeleted(0);
User user1 = userService.getOne(Condition.getQueryWrapper(user));
if (null!=user1){
- userVip.setUserId(user1.getId());
- UserVip vip = this.getOne(Condition.getQueryWrapper(userVip));
+ UserVip userVip1 = new UserVip();
+ userVip1.setUserId(user1.getId());
+ UserVip vip = this.getOne(Condition.getQueryWrapper(userVip1));
if (null!=vip){
UserVipVO vipVO = new UserVipVO();
vipVO.setIdCardNo(user1.getCardid());
vipVO.setSex(user1.getSex());
+ vipVO.setRealName(user1.getRealName());
return vipVO;
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2971097..8350317 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -215,7 +215,12 @@
- /recordk/save
- /recordk/details
- /blade-user/detail
- - /userVip/detail
+ - /userVip/getUserVipInfo
+ - /simulateExamRecord/getSimulateExamRecordInfo
+ - /simulateExamRecord/pauseExam
+ - /simulateExamRecord/getSimulateExamRefreshInfo
+ - /simulateExamRecord/beginExam
+ - /examSubjectChoices/getSubjectResultInfoBySimulate
#授权认证配置
auth:
--
Gitblit v1.9.3