考试安排

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementTimeQueryBo.java

@@ -39,6 +39,11 @@ public class ExamArrangementTimeQueryBo extends BaseEntity {
 	/** 考试开始时间 */
 	@ApiModelProperty("考试开始时间")
 	private Long startTime;
+
+	/** 考试开始时间 */
+	@ApiModelProperty("考试开始时间")
+	private Long arrangement_id;
+
 	/** 考试结束时间 */
 	@ApiModelProperty("考试结束时间")
 	private Long endTime;

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamArrangementStudentServiceImpl.java

@@ -2,16 +2,15 @@ package com.zhongzheng.modules.exam.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo;
+import com.zhongzheng.modules.exam.bo.*;
+import com.zhongzheng.modules.exam.service.IExamArrangementTimeService;
 import com.zhongzheng.modules.exam.vo.ExamUserVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
-import com.zhongzheng.modules.exam.bo.ExamArrangementStudentAddBo;
-import com.zhongzheng.modules.exam.bo.ExamArrangementStudentQueryBo;
-import com.zhongzheng.modules.exam.bo.ExamArrangementStudentEditBo;
 import com.zhongzheng.modules.exam.domain.ExamArrangementStudent;
 import com.zhongzheng.modules.exam.mapper.ExamArrangementStudentMapper;
 import com.zhongzheng.modules.exam.vo.ExamArrangementStudentVo;
@@ -31,6 +30,9 @@ import java.util.stream.Collectors;
 @Service
 public class ExamArrangementStudentServiceImpl extends ServiceImpl<ExamArrangementStudentMapper, ExamArrangementStudent> implements IExamArrangementStudentService {
 
+    @Autowired
+    private IExamArrangementTimeService examArrangementTimeService;
+
     @Override
     public ExamArrangementStudentVo queryById(Long arrangementId){
         ExamArrangementStudent db = this.baseMapper.selectById(arrangementId);
@@ -97,6 +99,12 @@ public class ExamArrangementStudentServiceImpl extends ServiceImpl<ExamArrangeme
     @Override
     public List<ExamUserVo> queryUserList(ExamArrangementQueryBo bo) {
         List<ExamUserVo> examUserVos = baseMapper.selectExamUserList(bo);
+        examUserVos.stream().forEach(e -> {
+                    ExamArrangementTimeQueryBo examArrangementTimeQueryBo = new ExamArrangementTimeQueryBo();
+                    examArrangementTimeQueryBo.setArrangement_id(e.getExamId());
+                    e.setExamArrangementTimeVo(examArrangementTimeService.queryList(examArrangementTimeQueryBo));
+        }
+        );
         return entity2UserVo(examUserVos);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamUserVo.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * 用户视图对象 mall_package
@@ -102,10 +104,109 @@ public class ExamUserVo {
 	@ApiModelProperty("用户积分")
 	private Long integral;
 
-	/** 考试安排，包含考试指引视图对象 */
-	@Excel(name = "考试安排，包含考试指引视图对象")
-	@ApiModelProperty("考试安排，包含考试指引视图对象")
-	private ExamArrangementVo examArrangementVo;
+	/** 考试安排主键 */
+	@ApiModelProperty("考试安排主键")
+	private Long examId;
+
+	/** 考试类型id */
+	@Excel(name = "考试类型id")
+	@ApiModelProperty("考试类型id")
+	private Long examTypeId;
+	/** 考试类型 */
+	@Excel(name = "考试类型")
+	@ApiModelProperty("考试类型")
+	private String examType;
+	/** 报名开始时间 */
+	@Excel(name = "报名开始时间")
+	@ApiModelProperty("报名开始时间")
+	private Long signStartTime;
+	/** 报名结束时间 */
+	@Excel(name = "报名结束时间")
+	@ApiModelProperty("报名结束时间")
+	private Long signEndTime;
+	/** 考试地点 */
+	@Excel(name = "考试地点")
+	@ApiModelProperty("考试地点")
+	private String examAdress;
+	/** 报名网址 */
+	@Excel(name = "报名网址")
+	@ApiModelProperty("报名网址")
+	private String examUrl;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remarks;
+	/** 0手动发布  3定时发布 4已结束 */
+	@Excel(name = "0手动发布  3定时发布 4已结束")
+	@ApiModelProperty("0手动发布  3定时发布 4已结束")
+	private Integer releaseNum;
+	/** 订阅人数 */
+	@Excel(name = "订阅人数")
+	@ApiModelProperty("订阅人数")
+	private Integer subscrPe;
+	/** 报名人数 */
+	@Excel(name = "报名人数")
+	@ApiModelProperty("报名人数")
+	private Integer signUpPe;
+	/** 定时发布的时间 */
+	@Excel(name = "定时发布的时间")
+	@ApiModelProperty("定时发布的时间")
+	private Long releaseTime;
+	/** 发布时间 */
+	@Excel(name = "发布时间")
+	@ApiModelProperty("发布时间")
+	private Long examTime;
+	/** 报名考试指引 */
+	@Excel(name = "报名考试指引")
+	@ApiModelProperty("报名考试指引")
+	private String regGuide;
+	/** 考试期次 */
+	@Excel(name = "考试期次")
+	@ApiModelProperty("考试期次")
+	private String examPeriod;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@Excel(name = "0删除 1待发布 2 撤回 3发布成功")
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private Integer status;
+	/** 0 笔试  1机考 */
+	@Excel(name = "0 笔试  1机考")
+	@ApiModelProperty("0 笔试  1机考")
+	private Integer examForm;
+	/** 考试通知网址 */
+	@Excel(name = "考试通知网址")
+	@ApiModelProperty("考试通知网址")
+	private String examFromUrl;
+	/** 打印网址 */
+	@Excel(name = "打印网址")
+	@ApiModelProperty("打印网址")
+	private String printUrl;
+	/** 成绩查询 */
+	@Excel(name = "成绩查询")
+	@ApiModelProperty("成绩查询")
+	private String gradesUrl;
+	/** 分数线查询 */
+	@Excel(name = "分数线查询")
+	@ApiModelProperty("分数线查询")
+	private String scoreLineUrl;
+	/** 申领证书 */
+	@Excel(name = "申领证书")
+	@ApiModelProperty("申领证书")
+	private String certificate;
+
+	/** 考试时间 */
+	@Excel(name = "考试时间")
+	@ApiModelProperty("考试时间")
+	private List<ExamArrangementTimeVo> examArrangementTimeVo;
+
+	/** 更改时间 */
+	@Excel(name = "更改时间")
+	@ApiModelProperty("更改时间")
+	private Long updateTime;
+
+	/** 创建时间 */
+	@Excel(name = "创建时间")
+	@ApiModelProperty("创建时间")
+	private Long createTime;
 
 	@ApiModelProperty("分类名")
 	private String categoryName;

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

@@ -30,8 +30,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="country" column="country"/>
         <result property="province" column="province"/>
         <result property="city" column="city"/>
+        <result property="examId" column="id"/>
         <result property="integral" column="integral"/>
-        <association property="examArrangementVo"  javaType="com.zhongzheng.modules.exam.vo.ExamArrangementVo" resultMap="ExamArrangementResult"/>
+        <result property="examTypeId" column="exam_type_id"/>
+        <result property="examType" column="exam_type"/>
+        <result property="signStartTime" column="sign_start_time"/>
+        <result property="signEndTime" column="sign_end_time"/>
+        <result property="examAdress" column="exam_adress"/>
+        <result property="examUrl" column="exam_url"/>
+        <result property="remarks" column="remarks"/>
+        <result property="releaseNum" column="release_num"/>
+        <result property="subscrPe" column="subscr_pe"/>
+        <result property="signUpPe" column="sign_up_pe"/>
+        <result property="releaseTime" column="release_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="examTime" column="exam_time"/>
+        <result property="regGuide" column="reg_guide"/>
+        <result property="examPeriod" column="exam_period"/>
+        <result property="status" column="status"/>
+        <result property="examForm" column="exam_form"/>
+        <result property="examFromUrl" column="exam_from_url"/>
+        <result property="printUrl" column="print_url"/>
+        <result property="gradesUrl" column="grades_url"/>
+        <result property="scoreLineUrl" column="score_line_url"/>
+        <result property="certificate" column="certificate"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamArrangementVo" id="ExamArrangementResult">