考试指南新加

zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamArrangementController.java

@@ -3,6 +3,10 @@ package com.zhongzheng.controller.exam;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.modules.exam.bo.*;
+import com.zhongzheng.modules.exam.domain.ExamArrangementGuide;
+import com.zhongzheng.modules.exam.service.IExamArrangementGuideService;
+import com.zhongzheng.modules.exam.vo.ExamArrangementGuideVo;
 import com.zhongzheng.modules.exam.vo.ExamUserVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,9 +24,6 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.modules.exam.vo.ExamArrangementVo;
-import com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo;
-import com.zhongzheng.modules.exam.bo.ExamArrangementAddBo;
-import com.zhongzheng.modules.exam.bo.ExamArrangementEditBo;
 import com.zhongzheng.modules.exam.service.IExamArrangementService;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.common.core.page.TableDataInfo;
@@ -43,6 +44,8 @@ public class ExamArrangementController extends BaseController {
 
     private final IExamArrangementService iExamArrangementService;
 
+    private final IExamArrangementGuideService iExamArrangementGuideService;
+
     /**
      * 查询考试安排，包含考试指引列表
      */
@@ -82,6 +85,18 @@ public class ExamArrangementController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     *查询考试指南
+     */
+    @ApiOperation("考试指南")
+    @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:list')")
+    @GetMapping("/listGuide")
+    public TableDataInfo<ExamArrangementGuideVo> listUserSub(ExamArrangementGuideQueryBo bo) {
+        startPage();
+        List<ExamArrangementGuideVo> list = iExamArrangementGuideService.queryList(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 导出考试安排，包含考试指引列表
      */
@@ -94,7 +109,27 @@ public class ExamArrangementController extends BaseController {
         ExcelUtil<ExamArrangementVo> util = new ExcelUtil<ExamArrangementVo>(ExamArrangementVo.class);
         return util.exportExcel(list, "考试安排，包含考试指引");
     }*/
+    /**
+     * 新增【考试指南】
+     */
+    @ApiOperation("新增【考试指南】")
+    @PreAuthorize("@ss.hasPermi('system:guide:add')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @PostMapping("addGuide")
+    public AjaxResult<Void> add(@RequestBody ExamArrangementGuideAddBo bo) {
+        return toAjax(iExamArrangementGuideService.insertByAddBo(bo) ? 1 : 0);
+    }
 
+    /**
+     * 修改【考试指南】
+     */
+    @ApiOperation("修改【考试指南】")
+    @PreAuthorize("@ss.hasPermi('system:guide:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PostMapping("editGuide")
+    public AjaxResult<Void> edit(@RequestBody ExamArrangementGuideEditBo bo) {
+        return toAjax(iExamArrangementGuideService.updateByEditBo(bo) ? 1 : 0);
+    }
     /**
      * 获取考试安排，包含考试指引详细信息
      */

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

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】添加对象 exam_arrangement_guide
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@ApiModel("【请填写功能名称】添加对象")
+public class ExamArrangementGuideAddBo {
+
+    /** 关联考试类型 */
+    @ApiModelProperty("关联考试类型")
+    private Long examTypeId;
+    /** 考试类型 */
+    @ApiModelProperty("考试类型")
+    private String examType;
+    /** 指引类型 0 报名指引  1打印准考证  2成绩查询指引 */
+    @ApiModelProperty("指引类型 0 报名指引  1打印准考证  2成绩查询指引")
+    private Integer typeNum;
+    /** 指引内容 */
+    @ApiModelProperty("指引内容")
+    private String typeText;
+    /** 0 删除  1发布 2 撤回 3未发布 */
+    @ApiModelProperty("0 删除  1发布 2 撤回 3未发布")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 【请填写功能名称】编辑对象 exam_arrangement_guide
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@ApiModel("【请填写功能名称】编辑对象")
+public class ExamArrangementGuideEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 关联考试类型 */
+    @ApiModelProperty("关联考试类型")
+    private Long examTypeId;
+
+    /** 考试类型 */
+    @ApiModelProperty("考试类型")
+    private String examType;
+
+    /** 指引类型 0 报名指引  1打印准考证  2成绩查询指引 */
+    @ApiModelProperty("指引类型 0 报名指引  1打印准考证  2成绩查询指引")
+    private Integer typeNum;
+
+    /** 指引内容 */
+    @ApiModelProperty("指引内容")
+    private String typeText;
+
+    /** 0 删除  1发布 2 撤回 3未发布 */
+    @ApiModelProperty("0 删除  1发布 2 撤回 3未发布")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 【请填写功能名称】分页查询对象 exam_arrangement_guide
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("【请填写功能名称】分页查询对象")
+public class ExamArrangementGuideQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 关联考试类型 */
+	@ApiModelProperty("关联考试类型")
+	private Long examTypeId;
+	/** 考试类型 */
+	@ApiModelProperty("考试类型")
+	private String examType;
+	/** 指引类型 0 报名指引  1打印准考证  2成绩查询指引 */
+	@ApiModelProperty("指引类型 0 报名指引  1打印准考证  2成绩查询指引")
+	private Integer typeNum;
+	/** 指引内容 */
+	@ApiModelProperty("指引内容")
+	private String typeText;
+	/** 0 删除  1发布 2 撤回 3未发布 */
+	@ApiModelProperty("0 删除  1发布 2 撤回 3未发布")
+	private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamArrangementGuide.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.exam.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 【请填写功能名称】对象 exam_arrangement_guide
+ * 
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_arrangement_guide")
+public class ExamArrangementGuide implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 关联考试类型 */
+    private Long examTypeId;
+
+    /** 考试类型 */
+    private String examType;
+
+    /** 指引类型 0 报名指引  1打印准考证  2成绩查询指引 */
+    private Integer typeNum;
+
+    /** 指引内容 */
+    private String typeText;
+
+    /** 0 删除  1发布 2 撤回 3未发布 */
+    private Integer status;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamArrangementGuide;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+public interface ExamArrangementGuideMapper extends BaseMapper<ExamArrangementGuide> {
+
+}

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

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.exam.mapper;
 
+import com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo;
 import com.zhongzheng.modules.exam.domain.ExamArrangement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.exam.vo.ExamArrangementVo;
+
+import java.util.List;
 
 /**
  * 考试安排，包含考试指引Mapper接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ExamArrangementMapper extends BaseMapper<ExamArrangement> {
 
+    List<ExamArrangementVo> selectExamgement(ExamArrangementQueryBo bo);
 }

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

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamArrangementGuide;
+import com.zhongzheng.modules.exam.vo.ExamArrangementGuideVo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementGuideQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementGuideAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementGuideEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+public interface IExamArrangementGuideService extends IService<ExamArrangementGuide> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamArrangementGuideVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamArrangementGuideVo> queryList(ExamArrangementGuideQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入【请填写功能名称】
+	 * @param bo 【请填写功能名称】新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamArrangementGuideAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改【请填写功能名称】
+	 * @param bo 【请填写功能名称】编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamArrangementGuideEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<ExamArrangementGuideVo> queryArrangementGuideQueryList(ExamArrangementGuideQueryBo bo);
+}

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

@@ -0,0 +1,109 @@
+package com.zhongzheng.modules.exam.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+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.ExamArrangementGuideAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementGuideQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementGuideEditBo;
+import com.zhongzheng.modules.exam.domain.ExamArrangementGuide;
+import com.zhongzheng.modules.exam.mapper.ExamArrangementGuideMapper;
+import com.zhongzheng.modules.exam.vo.ExamArrangementGuideVo;
+import com.zhongzheng.modules.exam.service.IExamArrangementGuideService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Service
+public class ExamArrangementGuideServiceImpl extends ServiceImpl<ExamArrangementGuideMapper, ExamArrangementGuide> implements IExamArrangementGuideService {
+
+    @Override
+    public ExamArrangementGuideVo queryById(Long id){
+        ExamArrangementGuide db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ExamArrangementGuideVo.class);
+    }
+
+    @Override
+    public List<ExamArrangementGuideVo> queryList(ExamArrangementGuideQueryBo bo) {
+        LambdaQueryWrapper<ExamArrangementGuide> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getExamTypeId() != null, ExamArrangementGuide::getExamTypeId, bo.getExamTypeId());
+        lqw.eq(StrUtil.isNotBlank(bo.getExamType()), ExamArrangementGuide::getExamType, bo.getExamType());
+        lqw.eq(bo.getTypeNum() != null, ExamArrangementGuide::getTypeNum, bo.getTypeNum());
+        lqw.eq(StrUtil.isNotBlank(bo.getTypeText()), ExamArrangementGuide::getTypeText, bo.getTypeText());
+        lqw.eq(bo.getStatus() != null, ExamArrangementGuide::getStatus, bo.getStatus());
+        lqw.notIn(bo.getStatus() == null, ExamArrangementGuide::getStatus, 0);
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamArrangementGuideVo> entity2Vo(Collection<ExamArrangementGuide> collection) {
+        List<ExamArrangementGuideVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamArrangementGuideVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamArrangementGuide> page = (Page<ExamArrangementGuide>)collection;
+            Page<ExamArrangementGuideVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamArrangementGuideAddBo bo) {
+        ExamArrangementGuide add = BeanUtil.toBean(bo, ExamArrangementGuide.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamArrangementGuideEditBo bo) {
+        ExamArrangementGuide update = BeanUtil.toBean(bo, ExamArrangementGuide.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamArrangementGuide entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<ExamArrangementGuideVo> queryArrangementGuideQueryList(ExamArrangementGuideQueryBo bo) {
+        return null;
+    }
+}

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

@@ -83,39 +83,8 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
     }
     @Override
     public List<ExamArrangementVo> queryList(ExamArrangementQueryBo bo) {
-        LambdaQueryWrapper<ExamArrangement> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getExamTypeId() != null, ExamArrangement::getExamTypeId, bo.getExamTypeId());
-        lqw.eq(StrUtil.isNotBlank(bo.getExamType()), ExamArrangement::getExamType, bo.getExamType());
-        lqw.eq(bo.getSignStartTime() != null, ExamArrangement::getSignStartTime, bo.getSignStartTime());
-        lqw.eq(bo.getSignEndTime() != null, ExamArrangement::getSignEndTime, bo.getSignEndTime());
-        lqw.eq(StrUtil.isNotBlank(bo.getExamAdress()), ExamArrangement::getExamAdress, bo.getExamAdress());
-        lqw.eq(StrUtil.isNotBlank(bo.getExamUrl()), ExamArrangement::getExamUrl, bo.getExamUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ExamArrangement::getRemarks, bo.getRemarks());
-        lqw.eq(bo.getReleaseNum() != null, ExamArrangement::getReleaseNum, "'"+bo.getReleaseNum()+"'");
-        lqw.eq(bo.getSubscrPe() != null, ExamArrangement::getSubscrPe, bo.getSubscrPe());
-        lqw.eq(bo.getSignUpPe() != null, ExamArrangement::getSignUpPe, bo.getSignUpPe());
-        lqw.eq(bo.getReleaseTime() != null, ExamArrangement::getReleaseTime, bo.getReleaseTime());
-        lqw.eq(bo.getExamTime() != null, ExamArrangement::getExamTime, bo.getExamTime());
-        lqw.eq(StrUtil.isNotBlank(bo.getRegGuide()), ExamArrangement::getRegGuide, bo.getRegGuide());
-        lqw.eq(StrUtil.isNotBlank(bo.getExamPeriod()), ExamArrangement::getExamPeriod, bo.getExamPeriod());
-        lqw.eq(bo.getStatus() != null, ExamArrangement::getStatus, bo.getStatus());
-        lqw.notIn(bo.getStatus() == null, ExamArrangement::getStatus, 0);
-        lqw.eq(bo.getExamForm() != null, ExamArrangement::getExamForm, bo.getExamForm());
-        lqw.eq(StrUtil.isNotBlank(bo.getExamFromUrl()), ExamArrangement::getExamFromUrl, bo.getExamFromUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getPrintUrl()), ExamArrangement::getPrintUrl, bo.getPrintUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getGradesUrl()), ExamArrangement::getGradesUrl, bo.getGradesUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getScoreLineUrl()), ExamArrangement::getScoreLineUrl, bo.getScoreLineUrl());
-        lqw.eq(StrUtil.isNotBlank(bo.getCertificate()), ExamArrangement::getCertificate, bo.getCertificate());
-        List<ExamArrangementVo> examArrangementVos = entity2Vo(this.list(lqw));
-        //獲得考試時間
-        examArrangementVos.stream().forEach(e -> {
-                    LambdaQueryWrapper<ExamArrangementTime> lqwTime = Wrappers.lambdaQuery();
-                    lqwTime.eq(true,ExamArrangementTime::getArrangementId,e.getId());
-                    List<ExamArrangementTime> list = examArrangementTimeService.list(lqwTime);
-                    List<ExamArrangementTimeVo> examArrangementTimeVos = entity2TimeVo(list);
-                    e.setExamArrangementTimeVo(examArrangementTimeVos);
-                }
-            );
+        List<ExamArrangementVo> examArrangementVos1 = baseMapper.selectExamgement(bo);
+        List<ExamArrangementVo> examArrangementVos = entity2Vo(examArrangementVos1);
         return examArrangementVos;
     }
 
@@ -125,12 +94,10 @@ public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMappe
     * @param collection 实体类集合
     * @return
     */
-    private List<ExamArrangementVo> entity2Vo(Collection<ExamArrangement> collection) {
-        List<ExamArrangementVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, ExamArrangementVo.class))
-                .collect(Collectors.toList());
+    private List<ExamArrangementVo> entity2Vo(List<ExamArrangementVo> collection) {
+        List<ExamArrangementVo> voList = collection;
         if (collection instanceof Page) {
-            Page<ExamArrangement> page = (Page<ExamArrangement>)collection;
+            Page<ExamArrangementVo> page = (Page<ExamArrangementVo>)collection;
             Page<ExamArrangementVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);

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

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.exam.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 【请填写功能名称】视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-06-08
+ */
+@Data
+@ApiModel("【请填写功能名称】视图对象")
+public class ExamArrangementGuideVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 关联考试类型 */
+	@Excel(name = "关联考试类型")
+	@ApiModelProperty("关联考试类型")
+	private Long examTypeId;
+	/** 考试类型 */
+	@Excel(name = "考试类型")
+	@ApiModelProperty("考试类型")
+	private String examType;
+	/** 指引类型 0 报名指引  1打印准考证  2成绩查询指引 */
+	@Excel(name = "指引类型 0 报名指引  1打印准考证  2成绩查询指引")
+	@ApiModelProperty("指引类型 0 报名指引  1打印准考证  2成绩查询指引")
+	private Integer typeNum;
+	/** 指引内容 */
+	@Excel(name = "指引内容")
+	@ApiModelProperty("指引内容")
+	private String typeText;
+	/** 0 删除  1发布 2 撤回 3未发布 */
+	@Excel(name = "0 删除  1发布 2 撤回 3未发布")
+	@ApiModelProperty("0 删除  1发布 2 撤回 3未发布")
+	private Integer status;
+
+}

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.system.mapper.ExamArrangementGuideMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamArrangementGuide" id="ExamArrangementGuideResult">
+        <result property="id" column="id"/>
+        <result property="examTypeId" column="exam_type_id"/>
+        <result property="examType" column="exam_type"/>
+        <result property="typeNum" column="type_num"/>
+        <result property="typeText" column="type_text"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -31,5 +31,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="certificate" column="certificate"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.exam.vo.ExamArrangementVo" id="ExamArrangementResultVo">
+        <result property="id" column="id"/>
+        <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"/>
+        <collection property="examArrangementTimeVo" javaType="java.util.List" resultMap="ExamArrangementTimeResult"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamArrangementTime" id="ExamArrangementTimeResult">
+        <result property="arrangementId" column="arrangement_id"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+    </resultMap>
 
+    <select id="selectExamgement" parameterType="com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo" resultMap="ExamArrangementResultVo">
+        SELECT
+            s.*,
+            e.*
+        FROM
+            exam_arrangement s
+                LEFT JOIN exam_arrangement_time e ON e.arrangement_id = s.id
+        WHERE 1=1
+          AND s.status != 0
+        <if test="startTime != null and startTime != ''">
+            and exists(select * from exam_arrangement_time where start_time BETWEEN #{startTime} and #{endTime})
+            or exists(select * from exam_arrangement_time where end_time BETWEEN #{startTime} and #{endTime})
+        </if>
+        <if test="signStartTime != null and signStartTime != ''">
+            and exists(select * from exam_arrangement where sign_start_time BETWEEN #{signStartTime} and #{signEndTime})
+            or exists(select * from exam_arrangement where sign_end_time BETWEEN #{signStartTime} and #{signEndTime})
+        </if>
+        <if test="examPeriod != null and examPeriod != ''">
+            and s.exam_period like concat('%',#{examPeriod},'%')
+        </if>
+        <if test="examTypeId != null and examTypeId != ''">
+            and s.exam_type_id = #{examTypeId}
+        </if>
+        group by s.id
+    </select>
 </mapper>

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

@@ -137,15 +137,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND e.status != 0
         <if test="startTime != null and startTime != ''">
             and exists(select * from exam_arrangement_time where start_time BETWEEN #{startTime} and #{endTime})
-        </if>
-        <if test="startTime != null and startTime != ''">
             or exists(select * from exam_arrangement_time where end_time BETWEEN #{startTime} and #{endTime})
         </if>
         <if test="examTypeId != null and examTypeId != ''">
             AND e.exam_type_id = #{examTypeId}
         </if>
         <if test="examPeriod != null and examPeriod != ''">
-            AND e.exam_period = #{examPeriod}
+            and e.exam_period like concat('%',#{examPeriod},'%')
         </if>
         <if test="idCard != null and idCard != ''">
             AND u.id_card = #{idCard}