考试安排

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

@@ -0,0 +1,118 @@
+package com.zhongzheng.controller.exam;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.exam.bo.*;
+import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
+import com.zhongzheng.modules.exam.service.IExamApplySiteService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+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.ExamApplyVo;
+import com.zhongzheng.modules.exam.service.IExamApplyService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 考试安排Controller
+ * 
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Api(value = "考试安排控制器", tags = {"考试安排管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/apply")
+public class ExamApplyController extends BaseController {
+
+    private final IExamApplyService iExamApplyService;
+
+    private final IExamApplySiteService iExamApplySiteService;
+
+    private final IExamApplyGoodsService iExamApplyGoodsService;
+
+    /**
+     * 查询考试安排列表
+     */
+    @ApiOperation("查询考试安排列表")
+    @PreAuthorize("@ss.hasPermi('system:apply:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ExamApplyVo> list(ExamApplyQueryBo bo) {
+        startPage();
+        List<ExamApplyVo> list = iExamApplyService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取考试安排详细信息
+     */
+    @ApiOperation("获取考试安排详细信息")
+    @PreAuthorize("@ss.hasPermi('system:apply:query')")
+    @GetMapping("/{examApplyId}")
+    public AjaxResult<ExamApplyVo> getInfo(@PathVariable("examApplyId" ) Long examApplyId) {
+        return AjaxResult.success(iExamApplyService.queryById(examApplyId));
+    }
+
+    /**
+     * 新增考试安排
+     */
+    @ApiOperation("新增考试安排")
+    @PreAuthorize("@ss.hasPermi('system:apply:add')")
+    @Log(title = "考试安排", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ExamApplyAddBo bo) {
+        return toAjax(iExamApplyService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改考试安排
+     */
+    @ApiOperation("修改考试安排")
+    @PreAuthorize("@ss.hasPermi('system:apply:edit')")
+    @Log(title = "考试安排", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult<Void> edit(@RequestBody ExamApplyEditBo bo) {
+        return toAjax(iExamApplyService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 新增考试安排地点
+     */
+    @ApiOperation("新增考试安排地点")
+    @PreAuthorize("@ss.hasPermi('system:site:add')")
+    @Log(title = "考试安排地点", businessType = BusinessType.INSERT)
+    @PostMapping("addSite")
+    public AjaxResult<Void> addSite(@RequestBody List<ExamApplySiteAddBo> bo) {
+        return toAjax(iExamApplySiteService.addSite(bo) ? 1 : 0);
+    }
+
+
+    /**
+     * 新增考试安排绑定商品
+     */
+    @ApiOperation("新增考试安排绑定商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:add')")
+    @Log(title = "考试安排绑定商品", businessType = BusinessType.INSERT)
+    @PostMapping("addGoods")
+    public AjaxResult<Void> addGoods(@RequestBody ExamApplyGoodsAddBo bo) {
+        return toAjax(iExamApplyGoodsService.addGoods(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamApplyAddBo.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_apply
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排添加对象")
+public class ExamApplyAddBo {
+
+    /** 考试封面 */
+    @ApiModelProperty("考试封面")
+    private String applyUrl;
+    /** 考试标题 */
+    @ApiModelProperty("考试标题")
+    private String applyName;
+    /** 考试简介 */
+    @ApiModelProperty("考试简介")
+    private String applyIntroduce;
+    /** 1非补考学员 2补考学员 3都有 */
+    @ApiModelProperty("1非补考学员 2补考学员 3都有")
+    private Integer applyStatus;
+    /** 开始日期 */
+    @ApiModelProperty("开始日期")
+    private Long applyStartTime;
+    /** 结束日期 */
+    @ApiModelProperty("结束日期")
+    private Long applyEndTime;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 1 启用 0未启用 -1删除 2已过期 */
+    @ApiModelProperty("1 启用 0未启用 -1删除 2已过期")
+    private Integer status;
+}

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

@@ -0,0 +1,57 @@
+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_apply
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排编辑对象")
+public class ExamApplyEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long examApplyId;
+
+    /** 考试封面 */
+    @ApiModelProperty("考试封面")
+    private String applyUrl;
+
+    /** 考试标题 */
+    @ApiModelProperty("考试标题")
+    private String applyName;
+
+    /** 考试简介 */
+    @ApiModelProperty("考试简介")
+    private String applyIntroduce;
+
+    /** 1非补考学员 2补考学员 3都有 */
+    @ApiModelProperty("1非补考学员 2补考学员 3都有")
+    private Integer applyStatus;
+
+    /** 开始日期 */
+    @ApiModelProperty("开始日期")
+    private Long applyStartTime;
+
+    /** 结束日期 */
+    @ApiModelProperty("结束日期")
+    private Long applyEndTime;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+    /** 1 启用 0未启用 -1删除 2已过期 */
+    @ApiModelProperty("1 启用 0未启用 -1删除 2已过期")
+    private Integer status;
+
+}

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

@@ -0,0 +1,33 @@
+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_apply_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排绑定商品添加对象")
+public class ExamApplyGoodsAddBo {
+
+    /** 绑定考试安排ID */
+    @ApiModelProperty("绑定考试安排ID")
+    private Long applyId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 绑定商品*/
+    @ApiModelProperty("绑定商品")
+    private Long[] goodsId;
+}

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

@@ -0,0 +1,37 @@
+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_apply_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排绑定商品编辑对象")
+public class ExamApplyGoodsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 绑定考试安排ID */
+    @ApiModelProperty("绑定考试安排ID")
+    private Long applyId;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long goodsId;
+
+}

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

@@ -0,0 +1,45 @@
+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_apply_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试安排绑定商品分页查询对象")
+public class ExamApplyGoodsQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 绑定考试安排ID */
+	@ApiModelProperty("绑定考试安排ID")
+	private Long applyId;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long goodsId;
+}

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

@@ -0,0 +1,60 @@
+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_apply
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试安排分页查询对象")
+public class ExamApplyQueryBo 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 String applyUrl;
+	/** 考试标题 */
+	@ApiModelProperty("考试标题")
+	private String applyName;
+	/** 考试简介 */
+	@ApiModelProperty("考试简介")
+	private String applyIntroduce;
+	/** 1非补考学员 2补考学员 3都有 */
+	@ApiModelProperty("1非补考学员 2补考学员 3都有")
+	private Integer applyStatus;
+	/** 开始日期 */
+	@ApiModelProperty("开始日期")
+	private Long applyStartTime;
+	/** 结束日期 */
+	@ApiModelProperty("结束日期")
+	private Long applyEndTime;
+	/** 1 启用 0未启用 -1删除 2已过期 */
+	@ApiModelProperty("1 启用 0未启用 -1删除 2已过期")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamApplySiteAddBo.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;
+import java.util.List;
+
+
+/**
+ * 考试安排地点添加对象 exam_apply_site
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排地点添加对象")
+public class ExamApplySiteAddBo {
+
+    /** 考试地点 */
+    @ApiModelProperty("考试地点")
+    private Long siteId;
+    /** 考试安排ID */
+    @ApiModelProperty("考试安排ID")
+    private Long applyId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+    /** 1 考试地点 2考培地点 */
+    @ApiModelProperty("1 考试地点 2考培地点")
+    private Integer status;
+
+    /** 考试时间 */
+    @ApiModelProperty("考试时间")
+    private List<ExamApplySiteTimeAddBo> examApplySiteTime;
+
+
+}

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

@@ -0,0 +1,41 @@
+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_apply_site
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排地点编辑对象")
+public class ExamApplySiteEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 考试地点 */
+    @ApiModelProperty("考试地点")
+    private Long siteId;
+
+    /** 考试安排ID */
+    @ApiModelProperty("考试安排ID")
+    private Long applyId;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+    /** 1 考试地点 2考培地点 */
+    @ApiModelProperty("1 考试地点 2考培地点")
+    private Integer status;
+
+}

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

@@ -0,0 +1,48 @@
+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_apply_site
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试安排地点分页查询对象")
+public class ExamApplySiteQueryBo 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 siteId;
+	/** 考试安排ID */
+	@ApiModelProperty("考试安排ID")
+	private Long applyId;
+	/** 1 考试地点 2考培地点 */
+	@ApiModelProperty("1 考试地点 2考培地点")
+	private Integer status;
+}

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

@@ -0,0 +1,41 @@
+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;
+import java.util.List;
+
+
+/**
+ * 考试安排地点绑定时间添加对象 exam_apply_site_time
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排地点绑定时间添加对象")
+public class ExamApplySiteTimeAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long applySiteId;
+    /** 时间的json */
+    @ApiModelProperty("时间的json")
+    private String siteTime;
+    /** 考试日期 */
+    @ApiModelProperty("考试日期")
+    private Long examTime;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private List<ExamApplySiteTimeTwoAddBo> examApplySiteTimeTwo;
+}

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

@@ -0,0 +1,41 @@
+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_apply_site_time
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排地点绑定时间编辑对象")
+public class ExamApplySiteTimeEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long applySiteId;
+
+    /** 时间的json */
+    @ApiModelProperty("时间的json")
+    private String siteTime;
+
+    /** 考试日期 */
+    @ApiModelProperty("考试日期")
+    private Long examTime;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+
+
+}

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

@@ -0,0 +1,48 @@
+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_apply_site_time
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试安排地点绑定时间分页查询对象")
+public class ExamApplySiteTimeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long applySiteId;
+	/** 时间的json */
+	@ApiModelProperty("时间的json")
+	private String siteTime;
+	/** 考试日期 */
+	@ApiModelProperty("考试日期")
+	private Long examTime;
+}

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

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 考试安排地点绑定时间添加对象 exam_apply_site_time
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@ApiModel("考试安排地点绑定时间添加对象")
+public class ExamApplySiteTimeTwoAddBo {
+
+
+    @ApiModelProperty("开始时间")
+    private Long startTime;
+    /** 更新时间 */
+    @ApiModelProperty("结束时间")
+    private Long endTime;
+
+    @ApiModelProperty("人数上限")
+    private Long num;
+}

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -47,5 +48,5 @@ public class ExamSiteQueryBo extends BaseEntity {
 	private Long people;
 	/** 1启用 0关闭 -1删除 */
 	@ApiModelProperty("1启用 0关闭 -1删除")
-	private Integer status;
+	private List<Integer> status;
 }

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

@@ -0,0 +1,49 @@
+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_apply
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_apply")
+public class ExamApply implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "exam_apply_id")
+    private Long examApplyId;
+    /** 考试封面 */
+    private String applyUrl;
+    /** 考试标题 */
+    private String applyName;
+    /** 考试简介 */
+    private String applyIntroduce;
+    /** 1非补考学员 2补考学员 3都有 */
+    private Integer applyStatus;
+    /** 开始日期 */
+    private Long applyStartTime;
+    /** 结束日期 */
+    private Long applyEndTime;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 1 启用 0未启用 -1删除 2已过期 */
+    private Integer status;
+}

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

@@ -0,0 +1,39 @@
+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_apply_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_apply_goods")
+public class ExamApplyGoods implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 绑定考试安排ID */
+    private Long applyId;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    private Long goodsId;
+}

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

@@ -0,0 +1,41 @@
+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_apply_site
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_apply_site")
+public class ExamApplySite implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 考试地点 */
+    private Long siteId;
+    /** 考试安排ID */
+    private Long applyId;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 1 考试地点 2考培地点 */
+    private Integer status;
+}

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

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.exam.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+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_apply_site_time
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_apply_site_time")
+public class ExamApplySiteTime implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** $column.columnComment */
+    private Long applySiteId;
+    /** 时间的json */
+    private String siteTime;
+    /** 考试日期 */
+    private Long examTime;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 考试安排ID */
+    private Long applyId;
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamApplyGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 考试安排绑定商品Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface ExamApplyGoodsMapper extends BaseMapper<ExamApplyGoods> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamApply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 考试安排Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface ExamApplyMapper extends BaseMapper<ExamApply> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamApplySite;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 考试安排地点Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface ExamApplySiteMapper extends BaseMapper<ExamApplySite> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamApplySiteTime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 考试安排地点绑定时间Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface ExamApplySiteTimeMapper extends BaseMapper<ExamApplySiteTime> {
+
+}

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

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamApplyGoods;
+import com.zhongzheng.modules.exam.vo.ExamApplyGoodsVo;
+import com.zhongzheng.modules.exam.bo.ExamApplyGoodsQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamApplyGoodsAddBo;
+import com.zhongzheng.modules.exam.bo.ExamApplyGoodsEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试安排绑定商品Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface IExamApplyGoodsService extends IService<ExamApplyGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamApplyGoodsVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamApplyGoodsVo> queryList(ExamApplyGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试安排绑定商品
+	 * @param bo 考试安排绑定商品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamApplyGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试安排绑定商品
+	 * @param bo 考试安排绑定商品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamApplyGoodsEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    boolean addGoods(ExamApplyGoodsAddBo bo);
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamApply;
+import com.zhongzheng.modules.exam.vo.ExamApplyVo;
+import com.zhongzheng.modules.exam.bo.ExamApplyQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamApplyAddBo;
+import com.zhongzheng.modules.exam.bo.ExamApplyEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试安排Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface IExamApplyService extends IService<ExamApply> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamApplyVo queryById(Long examApplyId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamApplyVo> queryList(ExamApplyQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试安排
+	 * @param bo 考试安排新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamApplyAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试安排
+	 * @param bo 考试安排编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamApplyEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamApplySite;
+import com.zhongzheng.modules.exam.vo.ExamApplySiteVo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteAddBo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试安排地点Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface IExamApplySiteService extends IService<ExamApplySite> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamApplySiteVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamApplySiteVo> queryList(ExamApplySiteQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试安排地点
+	 * @param bo 考试安排地点新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamApplySiteAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试安排地点
+	 * @param bo 考试安排地点编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamApplySiteEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    boolean addSite(List<ExamApplySiteAddBo> bo);
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamApplySiteTime;
+import com.zhongzheng.modules.exam.vo.ExamApplySiteTimeVo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeAddBo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试安排地点绑定时间Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+public interface IExamApplySiteTimeService extends IService<ExamApplySiteTime> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamApplySiteTimeVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamApplySiteTimeVo> queryList(ExamApplySiteTimeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试安排地点绑定时间
+	 * @param bo 考试安排地点绑定时间新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamApplySiteTimeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试安排地点绑定时间
+	 * @param bo 考试安排地点绑定时间编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamApplySiteTimeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,116 @@
+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.ExamApplyGoodsAddBo;
+import com.zhongzheng.modules.exam.bo.ExamApplyGoodsQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamApplyGoodsEditBo;
+import com.zhongzheng.modules.exam.domain.ExamApplyGoods;
+import com.zhongzheng.modules.exam.mapper.ExamApplyGoodsMapper;
+import com.zhongzheng.modules.exam.vo.ExamApplyGoodsVo;
+import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试安排绑定商品Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Service
+public class ExamApplyGoodsServiceImpl extends ServiceImpl<ExamApplyGoodsMapper, ExamApplyGoods> implements IExamApplyGoodsService {
+
+    @Override
+    public ExamApplyGoodsVo queryById(Long id){
+        ExamApplyGoods db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ExamApplyGoodsVo.class);
+    }
+
+    @Override
+    public List<ExamApplyGoodsVo> queryList(ExamApplyGoodsQueryBo bo) {
+        LambdaQueryWrapper<ExamApplyGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getApplyId() != null, ExamApplyGoods::getApplyId, bo.getApplyId());
+        lqw.eq(bo.getGoodsId() != null, ExamApplyGoods::getGoodsId, bo.getGoodsId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamApplyGoodsVo> entity2Vo(Collection<ExamApplyGoods> collection) {
+        List<ExamApplyGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamApplyGoodsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamApplyGoods> page = (Page<ExamApplyGoods>)collection;
+            Page<ExamApplyGoodsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamApplyGoodsAddBo bo) {
+        ExamApplyGoods add = BeanUtil.toBean(bo, ExamApplyGoods.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamApplyGoodsEditBo bo) {
+        ExamApplyGoods update = BeanUtil.toBean(bo, ExamApplyGoods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamApplyGoods entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public boolean addGoods(ExamApplyGoodsAddBo bo) {
+        LambdaQueryWrapper<ExamApplyGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ExamApplyGoods::getApplyId, bo.getApplyId());
+        this.remove(lqw);
+        for (Long goodsId : bo.getGoodsId()) {
+            ExamApplyGoods add = new ExamApplyGoods();
+            add.setCreateTime(DateUtils.getNowTime());
+            add.setUpdateTime(DateUtils.getNowTime());
+            add.setApplyId(bo.getApplyId());
+            add.setGoodsId(goodsId);
+            this.save(add);
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,105 @@
+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.ExamApplyAddBo;
+import com.zhongzheng.modules.exam.bo.ExamApplyQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamApplyEditBo;
+import com.zhongzheng.modules.exam.domain.ExamApply;
+import com.zhongzheng.modules.exam.mapper.ExamApplyMapper;
+import com.zhongzheng.modules.exam.vo.ExamApplyVo;
+import com.zhongzheng.modules.exam.service.IExamApplyService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试安排Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Service
+public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply> implements IExamApplyService {
+
+    @Override
+    public ExamApplyVo queryById(Long examApplyId){
+        ExamApply db = this.baseMapper.selectById(examApplyId);
+        return BeanUtil.toBean(db, ExamApplyVo.class);
+    }
+
+    @Override
+    public List<ExamApplyVo> queryList(ExamApplyQueryBo bo) {
+        LambdaQueryWrapper<ExamApply> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getApplyUrl()), ExamApply::getApplyUrl, bo.getApplyUrl());
+        lqw.like(StrUtil.isNotBlank(bo.getApplyName()), ExamApply::getApplyName, bo.getApplyName());
+        lqw.eq(StrUtil.isNotBlank(bo.getApplyIntroduce()), ExamApply::getApplyIntroduce, bo.getApplyIntroduce());
+        lqw.eq(bo.getApplyStatus() != null, ExamApply::getApplyStatus, bo.getApplyStatus());
+        lqw.eq(bo.getApplyStartTime() != null, ExamApply::getApplyStartTime, bo.getApplyStartTime());
+        lqw.eq(bo.getApplyEndTime() != null, ExamApply::getApplyEndTime, bo.getApplyEndTime());
+        lqw.eq(bo.getStatus() != null, ExamApply::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamApplyVo> entity2Vo(Collection<ExamApply> collection) {
+        List<ExamApplyVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamApplyVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamApply> page = (Page<ExamApply>)collection;
+            Page<ExamApplyVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamApplyAddBo bo) {
+        ExamApply add = BeanUtil.toBean(bo, ExamApply.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamApplyEditBo bo) {
+        ExamApply update = BeanUtil.toBean(bo, ExamApply.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamApply entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -0,0 +1,136 @@
+package com.zhongzheng.modules.exam.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeAddBo;
+import com.zhongzheng.modules.exam.domain.ExamApplySiteTime;
+import com.zhongzheng.modules.exam.service.IExamApplySiteTimeService;
+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.ExamApplySiteAddBo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteEditBo;
+import com.zhongzheng.modules.exam.domain.ExamApplySite;
+import com.zhongzheng.modules.exam.mapper.ExamApplySiteMapper;
+import com.zhongzheng.modules.exam.vo.ExamApplySiteVo;
+import com.zhongzheng.modules.exam.service.IExamApplySiteService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试安排地点Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Service
+public class ExamApplySiteServiceImpl extends ServiceImpl<ExamApplySiteMapper, ExamApplySite> implements IExamApplySiteService {
+
+    @Autowired
+    private IExamApplySiteTimeService examApplySiteTimeService;
+
+    @Override
+    public ExamApplySiteVo queryById(Long id){
+        ExamApplySite db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ExamApplySiteVo.class);
+    }
+
+    @Override
+    public List<ExamApplySiteVo> queryList(ExamApplySiteQueryBo bo) {
+        LambdaQueryWrapper<ExamApplySite> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSiteId() != null, ExamApplySite::getSiteId, bo.getSiteId());
+        lqw.eq(bo.getApplyId() != null, ExamApplySite::getApplyId, bo.getApplyId());
+        lqw.eq(bo.getStatus() != null, ExamApplySite::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamApplySiteVo> entity2Vo(Collection<ExamApplySite> collection) {
+        List<ExamApplySiteVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamApplySiteVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamApplySite> page = (Page<ExamApplySite>)collection;
+            Page<ExamApplySiteVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamApplySiteAddBo bo) {
+        ExamApplySite add = BeanUtil.toBean(bo, ExamApplySite.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamApplySiteEditBo bo) {
+        ExamApplySite update = BeanUtil.toBean(bo, ExamApplySite.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamApplySite entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public boolean addSite(List<ExamApplySiteAddBo> bo) {
+        LambdaQueryWrapper<ExamApplySite> lqw = Wrappers.lambdaQuery();
+        lqw.eq( ExamApplySite::getApplyId,bo.get(0).getApplyId());
+        this.remove(lqw);
+        LambdaQueryWrapper<ExamApplySiteTime> example = Wrappers.lambdaQuery();
+        example.eq( ExamApplySiteTime::getApplyId,bo.get(0).getApplyId());
+        examApplySiteTimeService.remove(example);
+        for (ExamApplySiteAddBo examApplySiteAddBo : bo) {
+            ExamApplySite add = BeanUtil.toBean(examApplySiteAddBo, ExamApplySite.class);
+            validEntityBeforeSave(add);
+            add.setCreateTime(DateUtils.getNowTime());
+            add.setUpdateTime(DateUtils.getNowTime());
+            this.save(add);
+            for (ExamApplySiteTimeAddBo examApplySiteTimeAddBo : examApplySiteAddBo.getExamApplySiteTime()) {
+                ExamApplySiteTime examApplySiteTime = BeanUtil.toBean(examApplySiteTimeAddBo, ExamApplySiteTime.class);
+                examApplySiteTime.setApplySiteId(add.getId());
+                examApplySiteTime.setApplyId(add.getApplyId());
+                examApplySiteTime.setSiteTime(JSONUtil.toJsonStr(examApplySiteTimeAddBo.getExamApplySiteTimeTwo()));
+                examApplySiteTime.setCreateTime(DateUtils.getNowTime());
+                examApplySiteTime.setUpdateTime(DateUtils.getNowTime());
+                examApplySiteTimeService.save(examApplySiteTime);
+            }
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,101 @@
+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.ExamApplySiteTimeAddBo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeEditBo;
+import com.zhongzheng.modules.exam.domain.ExamApplySiteTime;
+import com.zhongzheng.modules.exam.mapper.ExamApplySiteTimeMapper;
+import com.zhongzheng.modules.exam.vo.ExamApplySiteTimeVo;
+import com.zhongzheng.modules.exam.service.IExamApplySiteTimeService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试安排地点绑定时间Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-07
+ */
+@Service
+public class ExamApplySiteTimeServiceImpl extends ServiceImpl<ExamApplySiteTimeMapper, ExamApplySiteTime> implements IExamApplySiteTimeService {
+
+    @Override
+    public ExamApplySiteTimeVo queryById(Long id){
+        ExamApplySiteTime db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ExamApplySiteTimeVo.class);
+    }
+
+    @Override
+    public List<ExamApplySiteTimeVo> queryList(ExamApplySiteTimeQueryBo bo) {
+        LambdaQueryWrapper<ExamApplySiteTime> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getApplySiteId() != null, ExamApplySiteTime::getApplySiteId, bo.getApplySiteId());
+        lqw.eq(StrUtil.isNotBlank(bo.getSiteTime()), ExamApplySiteTime::getSiteTime, bo.getSiteTime());
+        lqw.eq(bo.getExamTime() != null, ExamApplySiteTime::getExamTime, bo.getExamTime());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamApplySiteTimeVo> entity2Vo(Collection<ExamApplySiteTime> collection) {
+        List<ExamApplySiteTimeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamApplySiteTimeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamApplySiteTime> page = (Page<ExamApplySiteTime>)collection;
+            Page<ExamApplySiteTimeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamApplySiteTimeAddBo bo) {
+        ExamApplySiteTime add = BeanUtil.toBean(bo, ExamApplySiteTime.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamApplySiteTimeEditBo bo) {
+        ExamApplySiteTime update = BeanUtil.toBean(bo, ExamApplySiteTime.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamApplySiteTime entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -44,7 +44,8 @@ public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteMapper, ExamSite> i
         lqw.eq(StrUtil.isNotBlank(bo.getCode()), ExamSite::getCode, bo.getCode());
         lqw.eq(StrUtil.isNotBlank(bo.getSiteAddress()), ExamSite::getSiteAddress, bo.getSiteAddress());
         lqw.eq(bo.getPeople() != null, ExamSite::getPeople, bo.getPeople());
-        lqw.eq(bo.getStatus() != null, ExamSite::getStatus, bo.getStatus());
+        lqw.in(CollectionUtils.isNotEmpty(bo.getStatus()), ExamSite::getStatus, bo.getStatus());
+        lqw.orderByDesc(ExamSite::getCreateTime);
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -0,0 +1,35 @@
+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-12-07
+ */
+@Data
+@ApiModel("考试安排绑定商品视图对象")
+public class ExamApplyGoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 绑定考试安排ID */
+	@Excel(name = "绑定考试安排ID")
+	@ApiModelProperty("绑定考试安排ID")
+	private Long applyId;
+	/** $column.columnComment */
+	@Excel(name = "绑定考试安排ID")
+	@ApiModelProperty("$column.columnComment")
+	private Long goodsId;
+}

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

@@ -0,0 +1,39 @@
+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-12-07
+ */
+@Data
+@ApiModel("考试安排地点绑定时间视图对象")
+public class ExamApplySiteTimeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long applySiteId;
+	/** 时间的json */
+	@Excel(name = "时间的json")
+	@ApiModelProperty("时间的json")
+	private String siteTime;
+	/** 考试日期 */
+	@Excel(name = "考试日期")
+	@ApiModelProperty("考试日期")
+	private Long examTime;
+}

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

@@ -0,0 +1,39 @@
+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-12-07
+ */
+@Data
+@ApiModel("考试安排地点视图对象")
+public class ExamApplySiteVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 考试地点 */
+	@Excel(name = "考试地点")
+	@ApiModelProperty("考试地点")
+	private Long siteId;
+	/** 考试安排ID */
+	@Excel(name = "考试安排ID")
+	@ApiModelProperty("考试安排ID")
+	private Long applyId;
+	/** 1 考试地点 2考培地点 */
+	@Excel(name = "1 考试地点 2考培地点")
+	@ApiModelProperty("1 考试地点 2考培地点")
+	private Integer status;
+}

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

@@ -0,0 +1,55 @@
+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-12-07
+ */
+@Data
+@ApiModel("考试安排视图对象")
+public class ExamApplyVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long examApplyId;
+
+	/** 考试封面 */
+	@Excel(name = "考试封面")
+	@ApiModelProperty("考试封面")
+	private String applyUrl;
+	/** 考试标题 */
+	@Excel(name = "考试标题")
+	@ApiModelProperty("考试标题")
+	private String applyName;
+	/** 考试简介 */
+	@Excel(name = "考试简介")
+	@ApiModelProperty("考试简介")
+	private String applyIntroduce;
+	/** 1非补考学员 2补考学员 3都有 */
+	@Excel(name = "1非补考学员 2补考学员 3都有")
+	@ApiModelProperty("1非补考学员 2补考学员 3都有")
+	private Integer applyStatus;
+	/** 开始日期 */
+	@Excel(name = "开始日期")
+	@ApiModelProperty("开始日期")
+	private Long applyStartTime;
+	/** 结束日期 */
+	@Excel(name = "结束日期")
+	@ApiModelProperty("结束日期")
+	private Long applyEndTime;
+	/** 1 启用 0未启用 -1删除 2已过期 */
+	@Excel(name = "1 启用 0未启用 -1删除 2已过期")
+	@ApiModelProperty("1 启用 0未启用 -1删除 2已过期")
+	private Integer status;
+}

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

@@ -0,0 +1,16 @@
+<?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.modules.exam.mapper.ExamApplyGoodsMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamApplyGoods" id="ExamApplyGoodsResult">
+        <result property="id" column="id"/>
+        <result property="applyId" column="apply_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="goodsId" column="goods_id"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.modules.exam.mapper.ExamApplyMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamApply" id="ExamApplyResult">
+        <result property="examApplyId" column="exam_apply_id"/>
+        <result property="applyUrl" column="apply_url"/>
+        <result property="applyName" column="apply_name"/>
+        <result property="applyIntroduce" column="apply_introduce"/>
+        <result property="applyStatus" column="apply_status"/>
+        <result property="applyStartTime" column="apply_start_time"/>
+        <result property="applyEndTime" column="apply_end_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?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.modules.exam.mapper.ExamApplySiteMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamApplySite" id="ExamApplySiteResult">
+        <result property="id" column="id"/>
+        <result property="siteId" column="site_id"/>
+        <result property="applyId" column="apply_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,17 @@
+<?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.modules.exam.mapper.ExamApplySiteTimeMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamApplySiteTime" id="ExamApplySiteTimeResult">
+        <result property="id" column="id"/>
+        <result property="applySiteId" column="apply_site_id"/>
+        <result property="siteTime" column="site_time"/>
+        <result property="examTime" column="exam_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -37,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT cpt.project_name FROM course_project_type cpt where cpt.id = en.project_id) as project_name,
             (SELECT cb.business_name FROM course_business cb where cb.id = en.business_id) as business_name
         FROM
-            exam_number en
+            exam_number en where 1=1
         <if test="status != null and status.size()!=0 ">
-            WHERE en.status in
+            AND en.status in
             <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
@@ -50,5 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsId != null and goodsId != ''">
             AND  AND  (SELECT COUNT(eng.id) FROM exam_number_goods eng where eng.goods_id =#{goodsId}) > 0
         </if>
+        order by en.create_time desc
     </select>
 </mapper>