做题历史

zhongzheng-api/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -144,6 +144,8 @@ public class GoodsController extends BaseController {
     @ApiOperation("查询模块卷关联章卷做过列表")
     @GetMapping("/chapter/dolist")
     public AjaxResult<List<QuestionChapterVo>> chapterDoList(QuestionModuleChapterQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         List<QuestionChapterVo> list = iQuestionModuleChapterService.getDoList(bo);
         return AjaxResult.success(list);
     }
@@ -154,6 +156,8 @@ public class GoodsController extends BaseController {
     @ApiOperation("查询章卷关联试卷做过列表")
     @GetMapping("/exam/dolist")
     public AjaxResult<List<ExamVo>> examDoList(QuestionChapterExamQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         List<ExamVo> list = iQuestionChapterExamService.getDoList(bo);
         return AjaxResult.success(list);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionChapterExamQueryBo.java

@@ -52,4 +52,6 @@ public class QuestionChapterExamQueryBo extends BaseEntity {
 
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
+	@ApiModelProperty("模块卷ID")
+	private Long moduleExamId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsAttachedVo.java

@@ -71,6 +71,7 @@ public class GoodsAttachedVo {
 
 	@ApiModelProperty("历史记录状态 是否完成 1完成 0未完成")
 	private Integer recordStatus;
+	@ApiModelProperty("做卷类型  1练习 2考试")
+	private Integer doType;
 
-	
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordAddBo.java

@@ -39,5 +39,10 @@ public class UserExamWrongRecordAddBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
-
+    /** 模块卷ID */
+    @ApiModelProperty("模块卷ID")
+    private Long moduleExamId;
+    /** 章卷ID */
+    @ApiModelProperty("章卷ID")
+    private Long chapterExamId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordEditBo.java

@@ -44,5 +44,11 @@ public class UserExamWrongRecordEditBo {
     /** 更新时间 */
     @ApiModelProperty("更新时间")
     private Long updateTime;
+    /** 模块卷ID */
+    @ApiModelProperty("模块卷ID")
+    private Long moduleExamId;
+    /** 章卷ID */
+    @ApiModelProperty("章卷ID")
+    private Long chapterExamId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamWrongRecord.java

@@ -42,4 +42,8 @@ private static final long serialVersionUID=1L;
     /** 更新时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    /** 模块卷ID */
+    private Long moduleExamId;
+    /** 章卷ID */
+    private Long chapterExamId;
 }

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

@@ -116,4 +116,12 @@ public class UserExamWrongRecordVo {
 	@Excel(name = "编码")
 	@ApiModelProperty("编码")
 	private String code;
+	/** 模块卷ID */
+	@Excel(name = "模块卷ID")
+	@ApiModelProperty("模块卷ID")
+	private Long moduleExamId;
+	/** 章卷ID */
+	@Excel(name = "章卷ID")
+	@ApiModelProperty("章卷ID")
+	private Long chapterExamId;
 }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionChapterExamMapper.xml

@@ -114,6 +114,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                        exam_id)) uer on uer.exam_id = e.exam_id
         WHERE
             qce.chapter_exam_id =#{chapterExamId}
-          AND e.status = 1 AND  e.exam_id IN ( SELECT exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id = 0 AND chapter_exam_id = 0 GROUP BY exam_id )
+          AND e.status = 1 AND  e.exam_id IN ( SELECT exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id = #{moduleExamId} AND chapter_exam_id = #{chapterExamId} GROUP BY exam_id )
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsAttachedMapper.xml

@@ -31,11 +31,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="doQuestionNum" column="do_question_num"/>
 		<result property="recordStatus" column="record_status"/>
 		<result property="recordId" column="record_id"/>
+		<result property="doType" column="do_type"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo" resultMap="GoodsAttachedResultVo">
 		SELECT
 			ga.*,
+			CASE
+
+			WHEN ga.type = 1 THEN
+			0
+			WHEN ga.type = 2 THEN
+			0
+			WHEN ga.type = 3 THEN
+			e.do_type
+			END do_type,
 			CASE
 
 				WHEN ga.type = 1 THEN

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

@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examId" column="exam_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="moduleExamId" column="module_exam_id"/>
+        <result property="chapterExamId" column="chapter_exam_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamWrongRecordVo" id="UserExamWrongRecordVoResult">
@@ -40,6 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="knowledgeIds" column="knowledge_ids"/>
         <result property="publishStatus" column="publish_status"/>
         <result property="code" column="code"/>
+        <result property="moduleExamId" column="module_exam_id"/>
+        <result property="chapterExamId" column="chapter_exam_id"/>
     </resultMap>