Bladeren bron

错误历史

he2802 3 jaren geleden
bovenliggende
commit
a01ec72a9a
26 gewijzigde bestanden met toevoegingen van 1138 en 5 verwijderingen
  1. 3 3
      zhongzheng-api/src/main/java/com/zhongzheng/controller/collect/CollectQuestionController.java
  2. 118 0
      zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserExamRecordController.java
  3. 116 0
      zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserExamWrongRecordController.java
  4. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionAddBo.java
  5. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectQuestion.java
  6. 1 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/ICollectQuestionService.java
  7. 7 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectQuestionServiceImpl.java
  8. 50 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordAddBo.java
  9. 57 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordEditBo.java
  10. 58 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordQueryBo.java
  11. 42 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordAddBo.java
  12. 48 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordEditBo.java
  13. 54 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordQueryBo.java
  14. 50 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamRecord.java
  15. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamWrongRecord.java
  16. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamRecordMapper.java
  17. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamWrongRecordMapper.java
  18. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamRecordService.java
  19. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamWrongRecordService.java
  20. 105 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamRecordServiceImpl.java
  21. 103 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamWrongRecordServiceImpl.java
  22. 55 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamRecordVo.java
  23. 47 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamWrongRecordVo.java
  24. 2 0
      zhongzheng-system/src/main/resources/mapper/modules/collect/CollectQuestionMapper.xml
  25. 21 0
      zhongzheng-system/src/main/resources/mapper/modules/user/UserExamRecordMapper.xml
  26. 19 0
      zhongzheng-system/src/main/resources/mapper/modules/user/UserExamWrongRecordMapper.xml

+ 3 - 3
zhongzheng-api/src/main/java/com/zhongzheng/controller/collect/CollectQuestionController.java

@@ -53,7 +53,7 @@ public class CollectQuestionController extends BaseController {
     /**
      * 查询收藏题目列表
      */
-    @ApiOperation("查询收藏题目列表,按题型")
+    @ApiOperation("查询收藏题目列表,按试卷")
     @GetMapping("/exam_list")
     public TableDataInfo<QuestionVo> exam_list(CollectQuestionQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
@@ -69,9 +69,9 @@ public class CollectQuestionController extends BaseController {
      */
     @ApiOperation("获取收藏题目详细信息")
     @GetMapping("/getInfo")
-    public AjaxResult<CollectQuestion> getInfo(Long questionId,Long examId) {
+    public AjaxResult<CollectQuestion> getInfo(Long questionId,Long examId,Long goodsId) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
-        return AjaxResult.success(iCollectQuestionService.queryQuestionById(loginUser.getUser().getUserId(),questionId,examId));
+        return AjaxResult.success(iCollectQuestionService.queryQuestionById(loginUser.getUser().getUserId(),questionId,examId,goodsId));
     }
 
     /**

+ 118 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserExamRecordController.java

@@ -0,0 +1,118 @@
+package com.zhongzheng.controller.user;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.user.bo.UserExamRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserExamRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import com.zhongzheng.modules.user.service.IUserExamRecordService;
+import com.zhongzheng.modules.user.vo.UserExamRecordVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 用户的题库试卷做题历史Controller
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Api(value = "用户的题库试卷做题历史控制器", tags = {"我的题库通-用户的题库试卷做题历史管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/exam/record")
+public class UserExamRecordController extends BaseController {
+
+    private final IUserExamRecordService iUserExamRecordService;
+    private final WxTokenService wxTokenService;
+
+
+    /**
+     * 查询用户的题库试卷做题历史列表
+     */
+    @ApiOperation("查询用户的题库试卷做题历史列表")
+    @PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo<UserExamRecordVo> list(UserExamRecordQueryBo bo) {
+        startPage();
+        List<UserExamRecordVo> list = iUserExamRecordService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户的题库试卷做题历史列表
+     */
+   /* @ApiOperation("导出用户的题库试卷做题历史列表")
+    @PreAuthorize("@ss.hasPermi('system:record:export')")
+    @Log(title = "用户的题库试卷做题历史", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<UserExamRecordVo> export(UserExamRecordQueryBo bo) {
+        List<UserExamRecordVo> list = iUserExamRecordService.queryList(bo);
+        ExcelUtil<UserExamRecordVo> util = new ExcelUtil<UserExamRecordVo>(UserExamRecordVo.class);
+        return util.exportExcel(list, "用户的题库试卷做题历史");
+    }*/
+
+    /**
+     * 获取用户的题库试卷做题历史详细信息
+     */
+    @ApiOperation("获取用户的题库试卷做题历史详细信息")
+    @GetMapping("/{recordId}")
+    public AjaxResult<UserExamRecordVo> getInfo(@PathVariable("recordId" ) Long recordId) {
+        return AjaxResult.success(iUserExamRecordService.queryById(recordId));
+    }
+
+    /**
+     * 新增用户的题库试卷做题历史
+     */
+    @ApiOperation("新增用户的题库试卷做题历史")
+    @Log(title = "用户的题库试卷做题历史", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Long> add(@RequestBody UserExamRecordAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iUserExamRecordService.insertByAddBo(bo));
+    }
+
+    /**
+     * 修改用户的题库试卷做题历史
+     */
+    @ApiOperation("修改用户的题库试卷做题历史")
+    @Log(title = "用户的题库试卷做题历史", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody UserExamRecordEditBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iUserExamRecordService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除用户的题库试卷做题历史
+     */
+    /*@ApiOperation("删除用户的题库试卷做题历史")
+    @PreAuthorize("@ss.hasPermi('system:record:remove')")
+    @Log(title = "用户的题库试卷做题历史" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{recordIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] recordIds) {
+        return toAjax(iUserExamRecordService.deleteWithValidByIds(Arrays.asList(recordIds), true) ? 1 : 0);
+    }*/
+}

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

@@ -0,0 +1,116 @@
+package com.zhongzheng.controller.user;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import com.zhongzheng.modules.user.service.IUserExamWrongRecordService;
+import com.zhongzheng.modules.user.vo.UserExamWrongRecordVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 用户我的题库错题记录Controller
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Api(value = "用户我的题库错题记录控制器", tags = {"我的题库通-用户我的题库错题记录管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/exam/wwrong/record")
+public class UserExamWrongRecordController extends BaseController {
+
+    private final IUserExamWrongRecordService iUserExamWrongRecordService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询用户我的题库错题记录列表
+     */
+    @ApiOperation("查询用户我的题库错题记录列表")
+    @GetMapping("/list")
+    public TableDataInfo<UserExamWrongRecordVo> list(UserExamWrongRecordQueryBo bo) {
+        startPage();
+        List<UserExamWrongRecordVo> list = iUserExamWrongRecordService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户我的题库错题记录列表
+     */
+    /*@ApiOperation("导出用户我的题库错题记录列表")
+    @PreAuthorize("@ss.hasPermi('system:record:export')")
+    @Log(title = "用户我的题库错题记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<UserExamWrongRecordVo> export(UserExamWrongRecordQueryBo bo) {
+        List<UserExamWrongRecordVo> list = iUserExamWrongRecordService.queryList(bo);
+        ExcelUtil<UserExamWrongRecordVo> util = new ExcelUtil<UserExamWrongRecordVo>(UserExamWrongRecordVo.class);
+        return util.exportExcel(list, "用户我的题库错题记录");
+    }*/
+
+    /**
+     * 获取用户我的题库错题记录详细信息
+     */
+    @ApiOperation("获取用户我的题库错题记录详细信息")
+    @GetMapping("/{wrongId}")
+    public AjaxResult<UserExamWrongRecordVo> getInfo(@PathVariable("wrongId" ) Long wrongId) {
+        return AjaxResult.success(iUserExamWrongRecordService.queryById(wrongId));
+    }
+
+    /**
+     * 新增用户我的题库错题记录
+     */
+    @ApiOperation("新增用户我的题库错题记录")
+    @Log(title = "用户我的题库错题记录", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody UserExamWrongRecordAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iUserExamWrongRecordService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改用户我的题库错题记录
+     */
+    @ApiOperation("修改用户我的题库错题记录")
+    @Log(title = "用户我的题库错题记录", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody UserExamWrongRecordEditBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iUserExamWrongRecordService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除用户我的题库错题记录
+     */
+    @ApiOperation("删除用户我的题库错题记录")
+    @Log(title = "用户我的题库错题记录" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete/{wrongIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] wrongIds) {
+        return toAjax(iUserExamWrongRecordService.deleteWithValidByIds(Arrays.asList(wrongIds), true) ? 1 : 0);
+    }
+}

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/bo/CollectQuestionAddBo.java

@@ -29,4 +29,7 @@ public class CollectQuestionAddBo {
     private Long createTime;
     @ApiModelProperty("试卷ID")
     private Long examId;
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectQuestion.java

@@ -40,5 +40,7 @@ private static final long serialVersionUID=1L;
     private Long createTime;
     @ApiModelProperty("试卷ID")
     private Long examId;
+    /** 商品ID */
+    private Long goodsId;
 
 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/ICollectQuestionService.java

@@ -26,7 +26,7 @@ public interface ICollectQuestionService extends IService<CollectQuestion> {
 
 
 
-	CollectQuestion queryQuestionById(Long userID, Long questionId, Long examId);
+	CollectQuestion queryQuestionById(Long userID, Long questionId, Long examId,Long goodsId);
 
 	List<QuestionVo> selectExamList(CollectQuestionQueryBo bo);
 

+ 7 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectQuestionServiceImpl.java

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.collect.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.bank.vo.QuestionVo;
 import com.zhongzheng.modules.collect.bo.CollectQuestionAddBo;
@@ -46,12 +48,16 @@ public class CollectQuestionServiceImpl extends ServiceImpl<CollectQuestionMappe
 
 
     @Override
-    public CollectQuestion queryQuestionById(Long userID, Long questionId, Long examId) {
+    public CollectQuestion queryQuestionById(Long userID, Long questionId, Long examId,Long goodsId) {
         CollectQuestion info = getOne(new LambdaQueryWrapper<CollectQuestion>()
                 .eq(CollectQuestion::getQuestionId,questionId)
                 .eq(CollectQuestion::getUserId,userID)
                 .eq(CollectQuestion::getExamId,examId)
+                .eq(CollectQuestion::getGoodsId,goodsId)
                 .last("limit 1"));
+        if(Validator.isEmpty(info)){
+            throw new CustomException("没收藏数据");
+        }
         return info;
     }
 

+ 50 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordAddBo.java

@@ -0,0 +1,50 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户的题库试卷做题历史添加对象 user_exam_record
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("用户的题库试卷做题历史添加对象")
+public class UserExamRecordAddBo {
+
+    /** 试卷ID */
+    @ApiModelProperty("试卷ID")
+    private Long examId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 是否完成 1完成 0未完成 */
+    @ApiModelProperty("是否完成 1完成 0未完成")
+    private Integer status;
+    /** 试卷绑定的商品 */
+    @ApiModelProperty("试卷绑定的商品")
+    private Long goodsId;
+    /** 1及格 0不及格 */
+    @ApiModelProperty("1及格 0不及格")
+    private Integer reportStatus;
+    /** 分数 */
+    @ApiModelProperty("分数")
+    private Long performance;
+
+    /** 历史做题JSON */
+    @ApiModelProperty("历史做题JSON")
+    private String historyExamJson;
+
+}

+ 57 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordEditBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 用户的题库试卷做题历史编辑对象 user_exam_record
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("用户的题库试卷做题历史编辑对象")
+public class UserExamRecordEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long recordId;
+
+    /** 试卷ID */
+    @ApiModelProperty("试卷ID")
+    private Long examId;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+
+    /** 是否完成 1完成 0未完成 */
+    @ApiModelProperty("是否完成 1完成 0未完成")
+    private Integer status;
+
+    /** 试卷绑定的商品 */
+    @ApiModelProperty("试卷绑定的商品")
+    private Long goodsId;
+
+    /** 1及格 0不及格 */
+    @ApiModelProperty("1及格 0不及格")
+    private Integer reportStatus;
+
+    /** 分数 */
+    @ApiModelProperty("分数")
+    private Long performance;
+
+    /** 历史做题JSON */
+    @ApiModelProperty("历史做题JSON")
+    private String historyExamJson;
+
+}

+ 58 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamRecordQueryBo.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 用户的题库试卷做题历史分页查询对象 user_exam_record
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户的题库试卷做题历史分页查询对象")
+public class UserExamRecordQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 试卷ID */
+	@ApiModelProperty("试卷ID")
+	private Long examId;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 是否完成 1完成 0未完成 */
+	@ApiModelProperty("是否完成 1完成 0未完成")
+	private Integer status;
+	/** 试卷绑定的商品 */
+	@ApiModelProperty("试卷绑定的商品")
+	private Long goodsId;
+	/** 1及格 0不及格 */
+	@ApiModelProperty("1及格 0不及格")
+	private Integer reportStatus;
+	/** 分数 */
+	@ApiModelProperty("分数")
+	private Long performance;
+
+}

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

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户我的题库错题记录添加对象 user_exam_wrong_record
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("用户我的题库错题记录添加对象")
+public class UserExamWrongRecordAddBo {
+
+    /** 做题记录ID */
+    @ApiModelProperty("做题记录ID")
+    private Long recordId;
+    /** 错误题目ID */
+    @ApiModelProperty("错误题目ID")
+    private Long questionId;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+    /** 试卷ID */
+    @ApiModelProperty("试卷ID")
+    private Integer examId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 用户我的题库错题记录编辑对象 user_exam_wrong_record
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("用户我的题库错题记录编辑对象")
+public class UserExamWrongRecordEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long wrongId;
+
+    /** 做题记录ID */
+    @ApiModelProperty("做题记录ID")
+    private Long recordId;
+
+    /** 错误题目ID */
+    @ApiModelProperty("错误题目ID")
+    private Long questionId;
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long goodsId;
+
+    /** 试卷ID */
+    @ApiModelProperty("试卷ID")
+    private Integer examId;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+}

+ 54 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamWrongRecordQueryBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 用户我的题库错题记录分页查询对象 user_exam_wrong_record
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户我的题库错题记录分页查询对象")
+public class UserExamWrongRecordQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 做题记录ID */
+	@ApiModelProperty("做题记录ID")
+	private Long recordId;
+	/** 错误题目ID */
+	@ApiModelProperty("错误题目ID")
+	private Long questionId;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 商品ID */
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	/** 试卷ID */
+	@ApiModelProperty("试卷ID")
+	private Integer examId;
+}

+ 50 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamRecord.java

@@ -0,0 +1,50 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 用户的题库试卷做题历史对象 user_exam_record
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_exam_record")
+public class UserExamRecord implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "record_id")
+    private Long recordId;
+    /** 试卷ID */
+    private Long examId;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 用户ID */
+    private Long userId;
+    /** 是否完成 1完成 0未完成 */
+    private Integer status;
+    /** 试卷绑定的商品 */
+    private Long goodsId;
+    /** 1及格 0不及格 */
+    private Integer reportStatus;
+    /** 分数 */
+    private Long performance;
+    /** 历史做题JSON */
+    private String historyExamJson;
+
+}

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

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 用户我的题库错题记录对象 user_exam_wrong_record
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_exam_wrong_record")
+public class UserExamWrongRecord implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "wrong_id")
+    private Long wrongId;
+    /** 做题记录ID */
+    private Long recordId;
+    /** 错误题目ID */
+    private Long questionId;
+    /** 用户ID */
+    private Long userId;
+    /** 商品ID */
+    private Long goodsId;
+    /** 试卷ID */
+    private Integer examId;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserExamRecordMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.UserExamRecord;
+
+/**
+ * 用户的题库试卷做题历史Mapper接口
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+public interface UserExamRecordMapper extends BaseMapper<UserExamRecord> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.UserExamWrongRecord;
+
+/**
+ * 用户我的题库错题记录Mapper接口
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+public interface UserExamWrongRecordMapper extends BaseMapper<UserExamWrongRecord> {
+
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserExamRecordService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.UserExamRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserExamRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
+import com.zhongzheng.modules.user.domain.UserExamRecord;
+import com.zhongzheng.modules.user.vo.UserExamRecordVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户的题库试卷做题历史Service接口
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+public interface IUserExamRecordService extends IService<UserExamRecord> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserExamRecordVo queryById(Long recordId);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserExamRecordVo> queryList(UserExamRecordQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户的题库试卷做题历史
+	 * @param bo 用户的题库试卷做题历史新增业务对象
+	 * @return
+	 */
+	Long insertByAddBo(UserExamRecordAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户的题库试卷做题历史
+	 * @param bo 用户的题库试卷做题历史编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserExamRecordEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo;
+import com.zhongzheng.modules.user.domain.UserExamWrongRecord;
+import com.zhongzheng.modules.user.vo.UserExamWrongRecordVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户我的题库错题记录Service接口
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+public interface IUserExamWrongRecordService extends IService<UserExamWrongRecord> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserExamWrongRecordVo queryById(Long wrongId);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserExamWrongRecordVo> queryList(UserExamWrongRecordQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户我的题库错题记录
+	 * @param bo 用户我的题库错题记录新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserExamWrongRecordAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改用户我的题库错题记录
+	 * @param bo 用户我的题库错题记录编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserExamWrongRecordEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 105 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamRecordServiceImpl.java

@@ -0,0 +1,105 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.user.bo.UserExamRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserExamRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
+import com.zhongzheng.modules.user.domain.UserExamRecord;
+import com.zhongzheng.modules.user.mapper.UserExamRecordMapper;
+import com.zhongzheng.modules.user.service.IUserExamRecordService;
+import com.zhongzheng.modules.user.vo.UserExamRecordVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户的题库试卷做题历史Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Service
+public class UserExamRecordServiceImpl extends ServiceImpl<UserExamRecordMapper, UserExamRecord> implements IUserExamRecordService {
+
+    @Override
+    public UserExamRecordVo queryById(Long recordId){
+        UserExamRecord db = this.baseMapper.selectById(recordId);
+        return BeanUtil.toBean(db, UserExamRecordVo.class);
+    }
+
+    @Override
+    public List<UserExamRecordVo> queryList(UserExamRecordQueryBo bo) {
+        LambdaQueryWrapper<UserExamRecord> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getExamId() != null, UserExamRecord::getExamId, bo.getExamId());
+        lqw.eq(bo.getUserId() != null, UserExamRecord::getUserId, bo.getUserId());
+        lqw.eq(bo.getStatus() != null, UserExamRecord::getStatus, bo.getStatus());
+        lqw.eq(bo.getGoodsId() != null, UserExamRecord::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getReportStatus() != null, UserExamRecord::getReportStatus, bo.getReportStatus());
+        lqw.eq(bo.getPerformance() != null, UserExamRecord::getPerformance, bo.getPerformance());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserExamRecordVo> entity2Vo(Collection<UserExamRecord> collection) {
+        List<UserExamRecordVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserExamRecordVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserExamRecord> page = (Page<UserExamRecord>)collection;
+            Page<UserExamRecordVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Long insertByAddBo(UserExamRecordAddBo bo) {
+        UserExamRecord add = BeanUtil.toBean(bo, UserExamRecord.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        this.save(add);
+        return add.getRecordId();
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserExamRecordEditBo bo) {
+        UserExamRecord update = BeanUtil.toBean(bo, UserExamRecord.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserExamRecord entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordAddBo;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordEditBo;
+import com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo;
+import com.zhongzheng.modules.user.domain.UserExamWrongRecord;
+import com.zhongzheng.modules.user.mapper.UserExamWrongRecordMapper;
+import com.zhongzheng.modules.user.service.IUserExamWrongRecordService;
+import com.zhongzheng.modules.user.vo.UserExamWrongRecordVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户我的题库错题记录Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Service
+public class UserExamWrongRecordServiceImpl extends ServiceImpl<UserExamWrongRecordMapper, UserExamWrongRecord> implements IUserExamWrongRecordService {
+
+    @Override
+    public UserExamWrongRecordVo queryById(Long wrongId){
+        UserExamWrongRecord db = this.baseMapper.selectById(wrongId);
+        return BeanUtil.toBean(db, UserExamWrongRecordVo.class);
+    }
+
+    @Override
+    public List<UserExamWrongRecordVo> queryList(UserExamWrongRecordQueryBo bo) {
+        LambdaQueryWrapper<UserExamWrongRecord> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getRecordId() != null, UserExamWrongRecord::getRecordId, bo.getRecordId());
+        lqw.eq(bo.getQuestionId() != null, UserExamWrongRecord::getQuestionId, bo.getQuestionId());
+        lqw.eq(bo.getUserId() != null, UserExamWrongRecord::getUserId, bo.getUserId());
+        lqw.eq(bo.getGoodsId() != null, UserExamWrongRecord::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getExamId() != null, UserExamWrongRecord::getExamId, bo.getExamId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserExamWrongRecordVo> entity2Vo(Collection<UserExamWrongRecord> collection) {
+        List<UserExamWrongRecordVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserExamWrongRecordVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserExamWrongRecord> page = (Page<UserExamWrongRecord>)collection;
+            Page<UserExamWrongRecordVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserExamWrongRecordAddBo bo) {
+        UserExamWrongRecord add = BeanUtil.toBean(bo, UserExamWrongRecord.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserExamWrongRecordEditBo bo) {
+        UserExamWrongRecord update = BeanUtil.toBean(bo, UserExamWrongRecord.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserExamWrongRecord entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 55 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamRecordVo.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户的题库试卷做题历史视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("用户的题库试卷做题历史视图对象")
+public class UserExamRecordVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long recordId;
+
+	/** 试卷ID */
+	@Excel(name = "试卷ID")
+	@ApiModelProperty("试卷ID")
+	private Long examId;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 是否完成 1完成 0未完成 */
+	@Excel(name = "是否完成 1完成 0未完成")
+	@ApiModelProperty("是否完成 1完成 0未完成")
+	private Integer status;
+	/** 试卷绑定的商品 */
+	@Excel(name = "试卷绑定的商品")
+	@ApiModelProperty("试卷绑定的商品")
+	private Long goodsId;
+	/** 1及格 0不及格 */
+	@Excel(name = "1及格 0不及格")
+	@ApiModelProperty("1及格 0不及格")
+	private Integer reportStatus;
+	/** 分数 */
+	@Excel(name = "分数")
+	@ApiModelProperty("分数")
+	private Long performance;
+	/** 历史做题JSON */
+	@Excel(name = "历史做题JSON")
+	@ApiModelProperty("历史做题JSON")
+	private String historyExamJson;
+}

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

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户我的题库错题记录视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-12-15
+ */
+@Data
+@ApiModel("用户我的题库错题记录视图对象")
+public class UserExamWrongRecordVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long wrongId;
+
+	/** 做题记录ID */
+	@Excel(name = "做题记录ID")
+	@ApiModelProperty("做题记录ID")
+	private Long recordId;
+	/** 错误题目ID */
+	@Excel(name = "错误题目ID")
+	@ApiModelProperty("错误题目ID")
+	private Long questionId;
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 商品ID */
+	@Excel(name = "商品ID")
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
+	/** 试卷ID */
+	@Excel(name = "试卷ID")
+	@ApiModelProperty("试卷ID")
+	private Integer examId;
+}

+ 2 - 0
zhongzheng-system/src/main/resources/mapper/modules/collect/CollectQuestionMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId" column="user_id"/>
         <result property="createTime" column="create_time"/>
         <result property="examId" column="exam_id"/>
+        <result property="goodsId" column="goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.collect.vo.CollectQuestionVo" id="CollectQuestionVoResult">
@@ -20,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examName" column="exam_name"/>
         <result property="questionNum" column="question_num"/>
         <result property="content" column="content"/>
+        <result property="goodsId" column="goods_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.collect.bo.CollectQuestionQueryBo"  resultMap="CollectQuestionVoResult">

+ 21 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserExamRecordMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.user.mapper.UserExamRecordMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserExamRecord" id="UserExamRecordResult">
+        <result property="recordId" column="record_id"/>
+        <result property="examId" column="exam_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="status" column="status"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="reportStatus" column="report_status"/>
+        <result property="performance" column="performance"/>
+        <result property="historyExamJson" column="history_exam_json"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.user.mapper.UserExamWrongRecordMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserExamWrongRecord" id="UserExamWrongRecordResult">
+        <result property="wrongId" column="wrong_id"/>
+        <result property="recordId" column="record_id"/>
+        <result property="questionId" column="question_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="examId" column="exam_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>