ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考试bug修改

This commit is contained in:
flower 2019-01-28 23:04:39 +08:00
parent 815ffbf39a
commit 8c607337a9
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java
View File

@ -132,12 +132,13 @@ public class CmsExaminationController {
@GetMapping() @GetMapping()
public String start(@PathVariable String id, ModelMap mmap) { public String start(@PathVariable String id, ModelMap mmap) {
ExamExamination examExamination = examExaminationService.selectById(id); ExamExamination examExamination = examExaminationService.selectById(id);
Integer examUserExaminationId = -1;
List<ExamQuestionVO> data = examExaminationService.queryExaminationQuestion(examExamination,examUserExaminationId); ExamUserExamination eue = new ExamUserExamination();
List<ExamQuestionVO> data = examExaminationService.queryExaminationQuestion(examExamination,eue);
Integer examPaperId = examExamination.getExamPaperId(); Integer examPaperId = examExamination.getExamPaperId();
mmap.put( "data", data ); mmap.put( "data", data );
mmap.put( "examUserExaminationId", examUserExaminationId ); mmap.put( "examUserExaminationId", eue.getId()==null?-1:eue.getId());
mmap.put( "examExamination", examExamination ); mmap.put( "examExamination", examExamination );
mmap.put("paperId", examPaperId); mmap.put("paperId", examPaperId);
return prefix+"detail"; return prefix+"detail";

3
ruoyi-cms/src/main/resources/templates/web/user/userexamination_detail.html
View File

@ -19,6 +19,9 @@
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;" th:if="${data.examExaminationVO.examEnd =='1' or data.examExaminationVO.examEnd =='2' or data.examExaminationVO.examEnd =='3'}"> <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;" th:if="${data.examExaminationVO.examEnd =='1' or data.examExaminationVO.examEnd =='2' or data.examExaminationVO.examEnd =='3'}">
<legend>得分:[[${data.score}]]</legend> <legend>得分:[[${data.score}]]</legend>
</fieldset> </fieldset>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;" th:if="${data.examExaminationVO.examEnd =='1' or data.examExaminationVO.examEnd =='2' or data.examExaminationVO.examEnd =='3'}">
<legend>该考试无法查看考试详情</legend>
</fieldset>
<div class="layui-collapse" lay-filter="test" th:if="${data.examExaminationVO.examEnd =='2' or data.examExaminationVO.examEnd =='3'}"> <div class="layui-collapse" lay-filter="test" th:if="${data.examExaminationVO.examEnd =='2' or data.examExaminationVO.examEnd =='3'}">
<div class="layui-colla-item" th:each="item:${data.examUserExaminationQuestions}"> <div class="layui-colla-item" th:each="item:${data.examUserExaminationQuestions}">
<h2 class="layui-colla-title">[[${itemStat.index+1}]]:[[${item.title}]] <h2 class="layui-colla-title">[[${itemStat.index+1}]]:[[${item.title}]]

3
ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.ruoyi.exam.domain.ExamQuestionVO; import com.ruoyi.exam.domain.ExamQuestionVO;
import com.ruoyi.exam.domain.ExamUserExamination;
import com.ruoyi.exam.domain.ExamUserExaminationQuestion; import com.ruoyi.exam.domain.ExamUserExaminationQuestion;
import com.ruoyi.framework.web.base.AbstractBaseService; import com.ruoyi.framework.web.base.AbstractBaseService;
import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.domain.SysUser;
@ -46,7 +47,7 @@ public interface IExamExaminationService extends AbstractBaseService<ExamExamina
*/ */
List<ExamExamination> selectEnterNameListFromWeb(Map<String, Object> map); List<ExamExamination> selectEnterNameListFromWeb(Map<String, Object> map);
List<ExamQuestionVO> queryExaminationQuestion(ExamExamination examExamination,Integer examUserExaminationId); List<ExamQuestionVO> queryExaminationQuestion(ExamExamination examExamination,ExamUserExamination examUserExamination);
Integer finshExamination(List<ExamUserExaminationQuestion> examUserExaminationQuestion, SysUser user, Integer examUserExaminationId, Integer examinationId, Integer paperId); Integer finshExamination(List<ExamUserExaminationQuestion> examUserExaminationQuestion, SysUser user, Integer examUserExaminationId, Integer examinationId, Integer paperId);
} }

20
ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java
View File

@ -79,7 +79,7 @@ public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl<ExamExam
} }
@Override @Override
public List<ExamQuestionVO> queryExaminationQuestion(ExamExamination examExamination, Integer examUserExaminationId) { public List<ExamQuestionVO> queryExaminationQuestion(ExamExamination examExamination, ExamUserExamination eue) {
String id = examExamination.getId().toString(); String id = examExamination.getId().toString();
SysUser sysUser = sysUserService.selectUserByLoginName(ShiroUtils.getLoginName()); SysUser sysUser = sysUserService.selectUserByLoginName(ShiroUtils.getLoginName());
Integer userId = Integer.parseInt(sysUser.getUserId().toString()); Integer userId = Integer.parseInt(sysUser.getUserId().toString());
@ -92,7 +92,6 @@ public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl<ExamExam
//考试时长 //考试时长
Integer timeLength = examExamination.getTimeLength(); Integer timeLength = examExamination.getTimeLength();
ExamUserExamination insert = new ExamUserExamination();
//正式考试 //正式考试
if (type.equals("2")) { if (type.equals("2")) {
ExamUserExamination examUserExamination = new ExamUserExamination(); ExamUserExamination examUserExamination = new ExamUserExamination();
@ -125,16 +124,15 @@ public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl<ExamExam
|| userExamination.get(0).getUpdateDate() != null //最后一次考试已交卷 || userExamination.get(0).getUpdateDate() != null //最后一次考试已交卷
|| userExamination.get(0).getCreateDate().getTime() + timeLength * 60 * 1000 < new Date().getTime()//最后一次考试，已超过考过时长 || userExamination.get(0).getCreateDate().getTime() + timeLength * 60 * 1000 < new Date().getTime()//最后一次考试，已超过考过时长
) { ) {
insert.setExamExaminationId(Integer.parseInt(id)); eue.setExamExaminationId(Integer.parseInt(id));
insert.setVipUserId(userId); eue.setVipUserId(userId);
insert.setCreateDate(new Date()); eue.setCreateDate(new Date());
insert.setExamPaperId(examPaperId); eue.setExamPaperId(examPaperId);
insert.setDelFlag("0"); eue.setDelFlag("0");
insert.setScore(0); eue.setScore(0);
examUserExaminationService.insertOne(insert); examUserExaminationService.insertOne(eue);
examUserExaminationId = insert.getId();
} else { } else {
examUserExaminationId = userExamination.get(0).getId(); eue.setId(userExamination.get(0).getId());
} }
} }