fix 模考预约添加字段

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

@@ -76,4 +76,7 @@ public class UserMockSubscribeAddBo {
     /** 第一次交卷时间 */
     @ApiModelProperty("第一次交卷时间")
     private Long firstHandTime;
+    /** 题号ID JSON*/
+    @ApiModelProperty("题号ID JSON")
+    private String recordIdJson;
 }

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

@@ -96,4 +96,8 @@ public class UserMockSubscribeEditBo {
     @ApiModelProperty("第一次交卷时间")
     private Long firstHandTime;
 
+    /** 题号ID JSON */
+    @ApiModelProperty("题号ID JSON")
+    private String recordIdJson;
+
 }

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

@@ -117,4 +117,8 @@ public class UserMockSubscribeQueryBo extends BaseEntity {
 	/** 考试结束时间 */
 	@ApiModelProperty("考试结束时间")
 	private Long endTime;
+
+	/** 题号ID JSON */
+	@ApiModelProperty("题号ID JSON")
+	private String recordIdJson;
 }

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

@@ -67,4 +67,6 @@ private static final long serialVersionUID=1L;
     private Integer firstSubjectiveScore;
     /** 第一次交卷时间 */
     private Long firstHandTime;
+    /** 题号ID JSON */
+    private String recordIdJson;
 }

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

@@ -79,6 +79,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         lqw.eq(bo.getFirstScore() != null, UserMockSubscribe::getFirstScore, bo.getFirstScore());
         lqw.eq(bo.getFirstSubjectiveScore() != null, UserMockSubscribe::getFirstSubjectiveScore, bo.getFirstSubjectiveScore());
         lqw.eq(bo.getFirstHandTime() != null, UserMockSubscribe::getFirstHandTime, bo.getFirstHandTime());
+        lqw.eq(bo.getRecordIdJson() != null, UserMockSubscribe::getRecordIdJson, bo.getRecordIdJson());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -164,4 +164,9 @@ public class UserMockSubscribeVo {
 	@Excel(name = "第一次交卷时间")
 	@ApiModelProperty("第一次交卷时间")
 	private Long firstHandTime;
+
+	/** 做题ID JSON */
+	@Excel(name = "做题ID JSON")
+	@ApiModelProperty("做题ID JSON")
+	private String recordIdJson;
 }

zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN course_subject cs ON mms.subject_id = cs.id
                  LEFT JOIN mock_major_subject_time mmst ON mms.mock_major_subject_id = mmst.mock_major_subject_id
         WHERE
-            UNIX_TIMESTAMP(NOW()) > mmst.exam_time
+            UNIX_TIMESTAMP(NOW()) < mmst.exam_time
         <if test="projectId != null and projectId != ''">
             and ma.project_id = #{projectId}
         </if>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zhongzheng.modules.user.domain.UserMockSubscribe" id="UserMockSubscribeResult">
         <result property="subscribeId" column="subscribe_id"/>
         <result property="userId" column="user_id"/>
+        <result property="eachExamId" column="each_exam_id"/>
         <result property="subscribeStatus" column="subscribe_status"/>
         <result property="beforeStatus" column="before_status"/>
         <result property="examStatus" column="exam_status"/>
@@ -20,6 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applySiteStartTime" column="apply_site_start_time"/>
         <result property="applySiteEndTime" column="apply_site_end_time"/>
         <result property="applySiteExamTime" column="apply_site_exam_time"/>
+        <result property="doNum" column="do_num"/>
+        <result property="firstScore" column="first_score"/>
+        <result property="firstSubjectiveScore" column="first_subjective_score"/>
+        <result property="firstHandTime" column="first_hand_time"/>
+        <result property="recordIdJson" column="record_id_json"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockSubscribeVo" id="UserMockSubscribeVoResult">
@@ -55,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="firstScore" column="first_score"/>
         <result property="firstSubjectiveScore" column="first_subjective_score"/>
         <result property="firstHandTime" column="first_hand_time"/>
+        <result property="recordIdJson" column="record_id_json"/>
     </resultMap>
     <select id="getInfo" parameterType="java.lang.Long" resultMap="UserMockSubscribeVoResult">
         SELECT 	ums.*,