fix 模考预约添加字段

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

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

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

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

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

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

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

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

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

@@ -79,7 +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());
+        lqw.eq(bo.getRecordId() != null, UserMockSubscribe::getRecordId, bo.getRecordId());
         return entity2Vo(this.list(lqw));
     }
 
@@ -194,6 +194,11 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
             }
         }
         update.setUpdateTime(DateUtils.getNowTime());
+        if (Validator.isNotEmpty(bo.getRecordId()) && userMockSubscribeVo.getRecordId() != null) {
+            update.setRecordId(userMockSubscribeVo.getRecordId() + "," + bo.getRecordId());
+        }else if (Validator.isNotEmpty(bo.getRecordId()) && userMockSubscribeVo.getRecordId() == null) {
+            update.setRecordId(userMockSubscribeVo.getRecordId() + bo.getRecordId());
+        }
         return this.updateById(update);
     }
 

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

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

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

@@ -25,7 +25,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"/>
+        <result property="recordId" column="record_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserMockSubscribeVo" id="UserMockSubscribeVoResult">
@@ -61,7 +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"/>
+        <result property="recordId" column="record_id"/>
     </resultMap>
     <select id="getInfo" parameterType="java.lang.Long" resultMap="UserMockSubscribeVoResult">
         SELECT 	ums.*,