错题

zhongzheng-api/src/main/java/com/zhongzheng/controller/bank/ExamController.java

@@ -45,7 +45,6 @@ public class ExamController extends BaseController {
      * 获取试卷详细信息
      */
     @ApiOperation("获取试卷详细信息")
-    @PreAuthorize("@ss.hasPermi('system:exam:query')")
     @GetMapping("/{examId}")
     public AjaxResult<ExamVo> getInfo(@PathVariable("examId" ) Long examId) {
         return AjaxResult.success(iExamService.queryById(examId));

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserExamWrongRecordController.java

@@ -85,11 +85,11 @@ public class UserExamWrongRecordController extends BaseController {
 
     @ApiOperation("类型获取题目列表")
     @GetMapping("/type_question_list")
-    public TableDataInfo<QuestionVo> type_question_list(UserExamWrongRecordQueryBo bo) {
+    public TableDataInfo<UserExamWrongRecordVo> type_question_list(UserExamWrongRecordQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         startPage();
-        List<QuestionVo> list = iUserExamWrongRecordService.selectTypeQuestionList(bo);
+        List<UserExamWrongRecordVo> list = iUserExamWrongRecordService.selectTypeQuestionList(bo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamWrongRecordMapper.java

@@ -20,5 +20,5 @@ public interface UserExamWrongRecordMapper extends BaseMapper<UserExamWrongRecor
     List<UserExamWrongRecordVo> selectList(UserExamWrongRecordQueryBo bo);
     List<UserExamWrongRecordVo> selectQuestionList(UserExamWrongRecordQueryBo bo);
     List<UserExamWrongRecordVo> selectTypeNum(UserExamWrongRecordQueryBo bo);
-    List<QuestionVo> selectTypeQuestionList(UserExamWrongRecordQueryBo bo);
+    List<UserExamWrongRecordVo> selectTypeQuestionList(UserExamWrongRecordQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamWrongRecordService.java

@@ -37,7 +37,7 @@ public interface IUserExamWrongRecordService extends IService<UserExamWrongRecor
 
 	List<UserExamWrongRecordVo> selectTypeNum(UserExamWrongRecordQueryBo bo);
 
-	List<QuestionVo> selectTypeQuestionList(UserExamWrongRecordQueryBo bo);
+	List<UserExamWrongRecordVo> selectTypeQuestionList(UserExamWrongRecordQueryBo bo);
 
 	/**
 	 * 根据新增业务对象插入用户我的题库错题记录

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamWrongRecordServiceImpl.java

@@ -70,7 +70,7 @@ public class UserExamWrongRecordServiceImpl extends ServiceImpl<UserExamWrongRec
     }
 
     @Override
-    public List<QuestionVo> selectTypeQuestionList(UserExamWrongRecordQueryBo bo) {
+    public List<UserExamWrongRecordVo> selectTypeQuestionList(UserExamWrongRecordQueryBo bo) {
         return userExamWrongRecordMapper.selectTypeQuestionList(bo);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/WrongQuestionVo.java

@@ -0,0 +1,99 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.bank.domain.QuestionBusiness;
+import com.zhongzheng.modules.bank.vo.ExamVo;
+import com.zhongzheng.modules.exam.domain.ExamKnowledge;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 题库题目视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-10-22
+ */
+@Data
+@ApiModel("题库题目视图对象")
+public class WrongQuestionVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 题目ID */
+	@ApiModelProperty("题目ID")
+	private Long questionId;
+
+	/** 题目正文 */
+	@Excel(name = "题目正文")
+	@ApiModelProperty("题目正文")
+	private String content;
+	/** 类型 1单选 2多选 3判断题 4简答题 5案列题 */
+	@Excel(name = "类型 1单选 2多选 3判断题 4简答题 5案列题")
+	@ApiModelProperty("类型 1单选 2多选 3判断题 4简答题 5案列题")
+	private Integer type;
+	/** 答案  判断题1正确 0错误; 单选为数字; 多选数字用,拼接; 从1坐标开始; */
+	@Excel(name = "答案  判断题1正确 0错误; 单选为数字; 多选数字用,拼接; 从1坐标开始;")
+	@ApiModelProperty("答案  判断题1正确 0错误; 单选为数字; 多选数字用,拼接; 从1坐标开始;")
+	private String answerQuestion;
+	/**  状态 1正常 0关闭 */
+	@Excel(name = " 状态 1正常 0关闭")
+	@ApiModelProperty(" 状态 1正常 0关闭")
+	private Integer status;
+	/** 解析文本 */
+	@Excel(name = "解析文本")
+	@ApiModelProperty("解析文本")
+	private String analysisContent;
+	/** 图片地址，多个,拼接 */
+	@Excel(name = "图片地址，多个,拼接")
+	@ApiModelProperty("图片地址，多个,拼接")
+	private String imgUrl;
+	/** 问题内容 */
+	@Excel(name = "问题内容")
+	@ApiModelProperty("问题内容")
+	private String jsonStr;
+	/** 前缀名称 */
+	@Excel(name = "前缀名称")
+	@ApiModelProperty("前缀名称")
+	private String prefixName;
+	/** 知识点id用,拼接 */
+	@Excel(name = "知识点id用,拼接")
+	@ApiModelProperty("知识点id用,拼接")
+	private String knowledgeIds;
+	/** 发布状态 1发布 0未发布 */
+	@Excel(name = "发布状态 1发布 0未发布")
+	@ApiModelProperty("发布状态 1发布 0未发布")
+	private Integer publishStatus;
+	/** 教育类型ID */
+	@Excel(name = "教育类型ID")
+	@ApiModelProperty("教育类型ID")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 科目id */
+	@Excel(name = "科目id")
+	@ApiModelProperty("科目id")
+	private Long subjectId;
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+
+	/** 商品ID */
+	@Excel(name = "商品ID")
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	/** 试卷ID */
+	@Excel(name = "试卷ID")
+	@ApiModelProperty("试卷ID")
+	private Integer examId;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamWrongRecordMapper.xml

@@ -42,20 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="code" column="code"/>
     </resultMap>
 
-    <resultMap type="com.zhongzheng.modules.bank.vo.QuestionVo" id="QuestionResultVo">
-        <result property="questionId" column="question_id"/>
-        <result property="content" column="content"/>
-        <result property="type" column="type"/>
-        <result property="answerQuestion" column="answer_question"/>
-        <result property="status" column="status"/>
-        <result property="analysisContent" column="analysis_content"/>
-        <result property="imgUrl" column="img_url"/>
-        <result property="jsonStr" column="json_str"/>
-        <result property="prefixName" column="prefix_name"/>
-        <result property="knowledgeIds" column="knowledge_ids"/>
-        <result property="publishStatus" column="publish_status"/>
-        <result property="code" column="code"/>
-    </resultMap>
+
 
     <select id="selectList" parameterType="com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo" resultMap="UserExamWrongRecordVoResult">
         SELECT
@@ -80,7 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectQuestionList" parameterType="com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo" resultMap="UserExamWrongRecordVoResult">
         SELECT DISTINCT
-        q.*
+        q.*,
+        uew.goods_id,
+        uew.exam_id
         FROM
         user_exam_wrong_record uew
         LEFT JOIN question q ON q.question_id = uew.question_id
@@ -114,9 +103,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             q.type
     </select>
 
-    <select id="selectTypeQuestionList" parameterType="com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo"  resultMap="QuestionResultVo">
+    <select id="selectTypeQuestionList" parameterType="com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo"  resultMap="UserExamWrongRecordVoResult">
         SELECT DISTINCT
-        q.*
+        q.*,
+        uew.goods_id,
+        uew.exam_id
         FROM
         user_exam_wrong_record uew
         LEFT JOIN question q ON uew.question_id = q.question_id