fix 模考做题记录

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

@@ -119,4 +119,9 @@ public class UserMockRecordVo {
 	@Excel(name = "提交时间")
 	@ApiModelProperty("提交时间")
 	private Long commitTime;
+
+	/** 预约ID */
+	@Excel(name = "预约ID")
+	@ApiModelProperty("预约ID")
+	private Long subscribeId;
 }

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

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="score" column="score"/>
         <result property="eachExamId" column="each_exam_id"/>
         <result property="commitTime" column="commit_time"/>
+        <result property="subscribeId" column="subscribe_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockWrongRecordVo" id="UserMockRecordQuestionVoResult">
@@ -91,11 +92,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             ue.*,
             e.exam_name,
-            ep.paper_name
+            ep.paper_name,
+            ums.subscribe_id
         FROM
             user_mock_record ue
                 LEFT JOIN exam e ON ue.exam_id = e.exam_id
                 LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+                LEFT JOIN user_mock_subscribe ums ON ue.each_exam_id = ums.each_exam_id
         WHERE
             ue.user_id = #{userId}
         <if test="paperId != null and paperId != ''">
@@ -120,7 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         ue.*,
         e.exam_name,
-        ep.paper_name
+        ep.paper_name,
+        ums.subscribe_id
         FROM
         (
         SELECT
@@ -132,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         user_mock_record ue
         LEFT JOIN exam e ON ue.exam_id = e.exam_id
         LEFT JOIN exam_paper ep ON e.exam_paper_id = ep.paper_id
+        LEFT JOIN user_mock_subscribe ums ON ue.each_exam_id = ums.each_exam_id
         WHERE
         ue.user_id = #{userId}
         GROUP BY