diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java index e7b1923f0..fa8864026 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiPracticeController.java @@ -32,6 +32,8 @@ public class ApiPracticeController extends BaseController { @Autowired private IExamQuestionService examQuestionService; + @Autowired + private ISysUserService sysUserService; /** * 查询练习列表 * @param examPractice @@ -55,6 +57,8 @@ public class ApiPracticeController extends BaseController { */ @GetMapping("/v1/practice/info") public AjaxResult queryOne(@RequestParam Map map) { + SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() ); + map.put( "vipUserId", sysUser.getUserId() ); List result = examQuestionService.selectQuestionListByPracticeId(map); if (map.containsKey("disorder") && map.get("disorder").toString().equals("1")) { Collections.shuffle(result); diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamPracticeQuestionVO.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamPracticeQuestionVO.java index 77fca5241..3bf2c7700 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamPracticeQuestionVO.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamPracticeQuestionVO.java @@ -9,6 +9,7 @@ public class ExamPracticeQuestionVO extends ExamPracticeQuestion { private String questionName; + public Integer getQuestionType() { return questionType; } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionVO.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionVO.java index 245114ec9..821c33e4f 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionVO.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionVO.java @@ -8,6 +8,15 @@ import java.util.List; public class ExamQuestionVO extends ExamQuestion{ private List questionItem; + private String examUserCollectionQuestionId; + + public String getExamUserCollectionQuestionId() { + return examUserCollectionQuestionId; + } + + public void setExamUserCollectionQuestionId(String examUserCollectionQuestionId) { + this.examUserCollectionQuestionId = examUserCollectionQuestionId; + } public List getQuestionItem() { return questionItem; } diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml index 7943f9e41..b648e6b3a 100644 --- a/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml +++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamQuestionMapper.xml @@ -33,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -102,7 +104,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" eqi.number AS item_number, eqi.exam_question_id AS item_exam_question_id, eqi.remarks AS item_remarks + + ,eucq.id as examUserCollectionQuestionId + from exam_question eq + + + left join exam_user_collection_question eucq on eucq.exam_question_id=eq.id and eucq.vip_user_id=#{vipUserId} + + INNER JOIN exam_practice_question epq ON eq.id = epq.exam_question_id INNER JOIN exam_question_item eqi ON eqi.exam_question_id = eq.id where epq.exam_practice_id = #{practiceId}