Merge remote-tracking branch 'origin/master'

school-paper/src/main/java/com/ruoyi/school/paper/domain/DbErrorList.java

@@ -37,6 +37,11 @@ public class DbErrorList extends BaseEntity {
      * 题目id
      */
     private Long questionBankId;
+
+    /**
+     * 答题记录编号
+     */
+    private Long recordId;
     /**
      * 备注
      */

school-paper/src/main/java/com/ruoyi/school/paper/domain/bo/DbErrorListBo.java

 package com.ruoyi.school.paper.domain.bo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
@@ -24,37 +25,36 @@ public class DbErrorListBo extends BaseEntity {
     /**
      * 主键id
      */
-    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 用户id
      */
-    @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long userId;
 
     /**
      * 试卷id
      */
-    @NotNull(message = "试卷id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long paperId;
 
     /**
+     * 答题记录编号
+     */
+    private Long recordId;
+
+    /**
      * 题目id
      */
-    @NotNull(message = "题目id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long questionBankId;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 状态：0正常，1删除
      */
-    @NotNull(message = "状态：0正常，1删除不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer status;
 
 

school-paper/src/main/java/com/ruoyi/school/paper/domain/vo/DbErrorListVo.java

@@ -40,6 +40,12 @@ public class DbErrorListVo {
     private Long paperId;
 
     /**
+     * 答题记录编号
+     */
+    @ExcelProperty(value = "答题记录编号")
+    private Long recordId;
+
+    /**
      * 题目id
      */
     @ExcelProperty(value = "题目id")

school-paper/src/main/resources/mapper/school-paper/DbErrorListMapper.xml

@@ -69,8 +69,8 @@
         dtprd.correct_answer AS correctAnswer
         FROM
         db_error_list AS del
-        LEFT JOIN db_test_paper_record AS dtpr ON del.paper_id = dtpr.test_paper_id
-        LEFT JOIN db_test_paper_record_detail AS dtprd ON del.question_bank_id = dtprd.question_bank_id
+        LEFT JOIN db_test_paper_record AS dtpr ON del.record_id = dtpr.id
+        LEFT JOIN db_test_paper_record_detail AS dtprd ON dtpr.id = dtprd.record_id
         LEFT JOIN db_question_bank_test_paper AS dqbtp ON dtprd.question_bank_id = dqbtp.id
         <where>
         del.user_id = #{request.userId}