预约考试地点展示

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamApplyMapper.java

@@ -57,7 +57,8 @@ public interface ExamApplyMapper extends BaseMapper<ExamApply> {
 
     List<ExamUserApplySiteVo> subscribeApplySiteTrain(ExamApplyQueryBo bo);
 
-    Long registrationTrain(Long applyId, Long examTime, String siteAddress, String startTime, String endTime);
+    Long registrationTrain(@Param("applyId")Long applyId,@Param("examTime") Long examTime,@Param("siteAddress") String siteAddress,@Param("startTime") String startTime,@Param("endTime") String endTime);
+
+    Long userStatusTrain(@Param("userId") Long userId,@Param("examTime") Long examTime,@Param("startTime") String startTime,@Param("endTime") String endTime);
 
-    Long userStatusTrain(Long userId, Long examTime, String startTime, String endTime);
 }

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

@@ -81,5 +81,37 @@ public class UserSubscribeEditBo {
     @ApiModelProperty("前培Id")
     private Long beforeId;
 
+    /** 考试地点 */
+    @ApiModelProperty("考试地点")
+    private String applySiteAddress;
+
+    /** 考试开始时间段 */
+    @ApiModelProperty("考试开始时间段")
+    private String applySiteStartTime;
+
+    /** 考试结束时间段 */
+    @ApiModelProperty("考试结束时间段")
+    private String applySiteEndTime;
+
+    /** 考试日期 */
+    @ApiModelProperty("考试日期")
+    private Long applySiteExamTime;
+
+    /** 考培地点 */
+    @ApiModelProperty("考培地点")
+    private String applySiteAddressTrain;
+
+    /** 考培开始时间段 */
+    @ApiModelProperty("考培开始时间段")
+    private String applySiteStartTrainTime;
+
+    /** 考培结束时间段 */
+    @ApiModelProperty("考培结束时间段")
+    private String applySiteEndTrainTime;
+
+    /** 考培日期 */
+    @ApiModelProperty("考培日期")
+    private Long applySiteExamTrainTime;
+
 
 }

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

@@ -61,4 +61,20 @@ private static final long serialVersionUID=1L;
     /** 前培Id */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long beforeId;
+    /** 考试地点 */
+    private String applySiteAddress;
+    /** 考试开始时间段 */
+    private String applySiteStartTime;
+    /** 考试结束时间段 */
+    private String applySiteEndTime;
+    /** 考试日期 */
+    private Long applySiteExamTime;
+    /** 考培地点 */
+    private String applySiteAddressTrain;
+    /** 考培开始时间段 */
+    private String applySiteStartTrainTime;
+    /** 考培结束时间段 */
+    private String applySiteEndTrainTime;
+    /** 考培日期 */
+    private Long applySiteExamTrainTime;
 }

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

@@ -129,20 +129,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     @Override
     public List<UserSubscribeVo> listSubscribe(UserSubscribeQueryBo bo) {
         List<UserSubscribeVo> userSubscribeVos = baseMapper.listSubscribe(bo);
-        for (UserSubscribeVo userSubscribeVo : userSubscribeVos) {
-            List<ExamApplySiteVo> examApplySite = examApplyMapper.addressExam(userSubscribeVo.getApplyId(),1L);
-            for (ExamApplySiteVo examApplySiteVo : examApplySite) {
-                List<ExamApplySiteTimeVo> examApplySiteTime = examApplyMapper.addressTimeExam(examApplySiteVo.getId());
-                examApplySiteVo.setExamApplySiteTime(examApplySiteTime);
-            }
-            List<ExamApplySiteVo> examApplySiteTrain = examApplyMapper.addressExam(userSubscribeVo.getApplyId(),2L);
-            for (ExamApplySiteVo examApplySiteVo : examApplySiteTrain) {
-                List<ExamApplySiteTimeVo> examApplySiteTime = examApplyMapper.addressTimeExam(examApplySiteVo.getId());
-                examApplySiteVo.setExamApplySiteTime(examApplySiteTime);
-            }
-            userSubscribeVo.setExamApplySite(examApplySite);
-            userSubscribeVo.setExamApplySiteTrain(examApplySiteTrain);
-        }
         return userSubscribeVos;
     }
 

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

@@ -127,10 +127,36 @@ public class UserSubscribeVo {
 	@ApiModelProperty("前培标题")
 	private String beforeName;
 
-	@ApiModelProperty("考试地点时间")
-	private List<ExamApplySiteVo> examApplySite;
-
-
-	@ApiModelProperty("考陪地点")
-	private List<ExamApplySiteVo> examApplySiteTrain;
+	/** 考试地点 */
+	@Excel(name = "考试地点")
+	@ApiModelProperty("考试地点")
+	private String applySiteAddress;
+	/** 考试开始时间段 */
+	@Excel(name = "考试开始时间段")
+	@ApiModelProperty("考试开始时间段")
+	private String applySiteStartTime;
+	/** 考试结束时间段 */
+	@Excel(name = "考试结束时间段")
+	@ApiModelProperty("考试结束时间段")
+	private String applySiteEndTime;
+	/** 考试日期 */
+	@Excel(name = "考试日期")
+	@ApiModelProperty("考试日期")
+	private Long applySiteExamTime;
+	/** 考培地点 */
+	@Excel(name = "考培地点")
+	@ApiModelProperty("考培地点")
+	private String applySiteAddressTrain;
+	/** 考培开始时间段 */
+	@Excel(name = "考培开始时间段")
+	@ApiModelProperty("考培开始时间段")
+	private String applySiteStartTrainTime;
+	/** 考培结束时间段 */
+	@Excel(name = "考培结束时间段")
+	@ApiModelProperty("考培结束时间段")
+	private String applySiteEndTrainTime;
+	/** 考培日期 */
+	@Excel(name = "考培日期")
+	@ApiModelProperty("考培日期")
+	private Long applySiteExamTrainTime;
 }

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -328,7 +328,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             subscribe_status = 1
           AND us.apply_id = #{applyId}
           AND us.apply_site_exam_time = #{examTime}
-          AND us.apply_site_adress = #{siteAddress}
+          AND us.apply_site_address = #{siteAddress}
           AND us.apply_site_start_time =#{startTime}
           AND us.apply_site_end_time =#{endTime}
     </select>
@@ -369,7 +369,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             subscribe_status = 1
           AND us.apply_id = #{applyId}
           AND us.apply_site_exam_train_time = #{examTime}
-          AND us.apply_site_adress_train = #{siteAddress}
+          AND us.apply_site_address_train = #{siteAddress}
           AND us.apply_site_start_train_time =#{startTime}
           AND us.apply_site_end_train_time =#{endTime}
     </select>

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

@@ -47,6 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyName" column="apply_name"/>
         <result property="beforeId" column="before_id"/>
         <result property="beforeName" column="before_name"/>
+        <result property="applySiteAddress" column="apply_site_address"/>
+        <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="applySiteAddressTrain" column="apply_site_address_train"/>
+        <result property="applySiteStartTrainTime" column="apply_site_start_train_time"/>
+        <result property="applySiteEndTrainTime" column="apply_site_end_train_time"/>
+        <result property="applySiteExamTrainTime" column="apply_site_exam_train_time"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">