change 3 жил өмнө
parent
commit
8c0c86b494
33 өөрчлөгдсөн 1699 нэмэгдсэн , 0 устгасан
  1. 106 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamNumberController.java
  2. 90 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamSiteController.java
  3. 55 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberAddBo.java
  4. 65 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberEditBo.java
  5. 33 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberGoodsAddBo.java
  6. 37 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberGoodsEditBo.java
  7. 63 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberGoodsQueryBo.java
  8. 69 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberQueryBo.java
  9. 39 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamSiteAddBo.java
  10. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamSiteEditBo.java
  11. 51 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamSiteQueryBo.java
  12. 51 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamNumber.java
  13. 39 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamNumberGoods.java
  14. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamSite.java
  15. 21 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamNumberGoodsMapper.java
  16. 19 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamNumberMapper.java
  17. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamSiteMapper.java
  18. 56 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamNumberGoodsService.java
  19. 54 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamNumberService.java
  20. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamSiteService.java
  21. 111 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamNumberGoodsServiceImpl.java
  22. 164 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamNumberServiceImpl.java
  23. 104 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamSiteServiceImpl.java
  24. 57 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamNumberGoodsVo.java
  25. 71 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamNumberVo.java
  26. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamSiteVo.java
  27. 4 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java
  28. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java
  29. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformClassifyServiceImpl.java
  30. 1 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java
  31. 65 0
      zhongzheng-system/src/main/resources/mapper/modules/exam/ExamNumberGoodsMapper.xml
  32. 54 0
      zhongzheng-system/src/main/resources/mapper/modules/exam/ExamNumberMapper.xml
  33. 18 0
      zhongzheng-system/src/main/resources/mapper/modules/exam/ExamSiteMapper.xml

+ 106 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamNumberController.java

@@ -0,0 +1,106 @@
+package com.zhongzheng.controller.exam;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
+import com.zhongzheng.modules.exam.service.IExamNumberGoodsService;
+import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
+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.ExamNumberVo;
+import com.zhongzheng.modules.exam.bo.ExamNumberQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamNumberAddBo;
+import com.zhongzheng.modules.exam.bo.ExamNumberEditBo;
+import com.zhongzheng.modules.exam.service.IExamNumberService;
+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-06
+ */
+@Api(value = "考试次数配置控制器", tags = {"考试次数配置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/number")
+public class ExamNumberController extends BaseController {
+
+    private final IExamNumberService iExamNumberService;
+    private final IExamNumberGoodsService iExamNumberGoodsService;
+
+    /**
+     * 查询考试次数配置列表
+     */
+    @ApiOperation("查询考试次数配置列表")
+    @PreAuthorize("@ss.hasPermi('system:number:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ExamNumberVo> list(ExamNumberQueryBo bo) {
+        startPage();
+        List<ExamNumberVo> list = iExamNumberService.ListExamNumber(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取考试次数配置详细信息
+     */
+    @ApiOperation("获取考试次数配置详细信息")
+    @PreAuthorize("@ss.hasPermi('system:number:query')")
+    @GetMapping("/{examNumberId}")
+    public AjaxResult<ExamNumberVo> getInfo(@PathVariable("examNumberId" ) Long examNumberId) {
+        return AjaxResult.success(iExamNumberService.queryById(examNumberId));
+    }
+
+    /**
+     * 新增考试次数配置
+     */
+    @ApiOperation("新增考试次数配置")
+    @PreAuthorize("@ss.hasPermi('system:number:add')")
+    @Log(title = "考试次数配置", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ExamNumberAddBo bo) {
+        return toAjax(iExamNumberService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改考试次数配置
+     */
+    @ApiOperation("修改考试次数配置")
+    @PreAuthorize("@ss.hasPermi('system:number:edit')")
+    @Log(title = "考试次数配置", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult<Void> edit(@RequestBody ExamNumberEditBo bo) {
+        return toAjax(iExamNumberService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 查询考试配置绑定商品列表
+     */
+    @ApiOperation("查询考试配置商品列表")
+    @PreAuthorize("@ss.hasPermi('system:goods:list')")
+    @GetMapping("/listGoods")
+    public TableDataInfo<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo) {
+        startPage();
+        List<ExamNumberGoodsVo> list = iExamNumberGoodsService.listGoods(bo);
+        return getDataTable(list);
+    }
+
+}

+ 90 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/exam/ExamSiteController.java

@@ -0,0 +1,90 @@
+package com.zhongzheng.controller.exam;
+
+import java.util.List;
+import java.util.Arrays;
+
+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.ExamSiteVo;
+import com.zhongzheng.modules.exam.bo.ExamSiteQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamSiteAddBo;
+import com.zhongzheng.modules.exam.bo.ExamSiteEditBo;
+import com.zhongzheng.modules.exam.service.IExamSiteService;
+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-06
+ */
+@Api(value = "考试地点控制器", tags = {"考试地点管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/site")
+public class ExamSiteController extends BaseController {
+
+    private final IExamSiteService iExamSiteService;
+
+    /**
+     * 查询考试地点列表
+     */
+    @ApiOperation("查询考试地点列表")
+    @PreAuthorize("@ss.hasPermi('system:site:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ExamSiteVo> list(ExamSiteQueryBo bo) {
+        startPage();
+        List<ExamSiteVo> list = iExamSiteService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取考试地点详细信息
+     */
+    @ApiOperation("获取考试地点详细信息")
+    @PreAuthorize("@ss.hasPermi('system:site:query')")
+    @GetMapping("/{siteId}")
+    public AjaxResult<ExamSiteVo> getInfo(@PathVariable("siteId" ) Long siteId) {
+        return AjaxResult.success(iExamSiteService.queryById(siteId));
+    }
+
+    /**
+     * 新增考试地点
+     */
+    @ApiOperation("新增考试地点")
+    @PreAuthorize("@ss.hasPermi('system:site:add')")
+    @Log(title = "考试地点", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ExamSiteAddBo bo) {
+        return toAjax(iExamSiteService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改考试地点
+     */
+    @ApiOperation("修改考试地点")
+    @PreAuthorize("@ss.hasPermi('system:site:edit')")
+    @Log(title = "考试地点", businessType = BusinessType.UPDATE)
+    @PostMapping("edit")
+    public AjaxResult<Void> edit(@RequestBody ExamSiteEditBo bo) {
+        return toAjax(iExamSiteService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+}

+ 55 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberAddBo.java

@@ -0,0 +1,55 @@
+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_number
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@ApiModel("考试次数配置添加对象")
+public class ExamNumberAddBo {
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 考试次数 */
+    @ApiModelProperty("考试次数")
+    private Long examNumber;
+    /** 前培次数 */
+    @ApiModelProperty("前培次数")
+    private Long doNumber;
+    /** 1启用 0关闭 */
+    @ApiModelProperty("1启用 0关闭")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 商品类型 1视频2题库 3补考 4前培  */
+    @ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
+    private Integer goodsType;
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long[] goodsId;
+}

+ 65 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberEditBo.java

@@ -0,0 +1,65 @@
+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_number
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@ApiModel("考试次数配置编辑对象")
+public class ExamNumberEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long examNumberId;
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+
+    /** 考试次数 */
+    @ApiModelProperty("考试次数")
+    private Long examNumber;
+
+    /** 前培次数 */
+    @ApiModelProperty("前培次数")
+    private Long doNumber;
+
+    /** 1启用 0关闭 */
+    @ApiModelProperty("1启用 0关闭")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 商品类型 1视频2题库 3补考 4前培  */
+    @ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
+    private Integer goodsType;
+
+    /** 教育类型id */
+    @ApiModelProperty("教育类型id")
+    private Long educationTypeId;
+
+    /** 业务层次id */
+    @ApiModelProperty("业务层次id")
+    private Long businessId;
+
+    /** 项目ID */
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    /** 商品ID */
+    @ApiModelProperty("商品ID")
+    private Long[] goodsId;
+
+}

+ 33 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberGoodsAddBo.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_number_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@ApiModel("考试配置绑定商品添加对象")
+public class ExamNumberGoodsAddBo {
+
+    /** 绑定考试次数配置 */
+    @ApiModelProperty("绑定考试次数配置")
+    private Long examNumberId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long goodsId;
+}

+ 37 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberGoodsEditBo.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_number_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@ApiModel("考试配置绑定商品编辑对象")
+public class ExamNumberGoodsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 绑定考试次数配置 */
+    @ApiModelProperty("绑定考试次数配置")
+    private Long examNumberId;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long goodsId;
+
+}

+ 63 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberGoodsQueryBo.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.modules.exam.bo;
+
+import com.zhongzheng.common.annotation.Excel;
+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_number_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试配置绑定商品分页查询对象")
+public class ExamNumberGoodsQueryBo 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 examNumberId;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long goodsId;
+
+	/** 商品类型 1视频2题库 3补考 4前培  */
+	@Excel(name = "商品类型 1视频2题库 3补考 4前培 ")
+	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
+	private Integer goodsType;
+	/** 教育类型id */
+	@Excel(name = "教育类型id")
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+}

+ 69 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamNumberQueryBo.java

@@ -0,0 +1,69 @@
+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.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 考试次数配置分页查询对象 exam_number
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试次数配置分页查询对象")
+public class ExamNumberQueryBo 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 examNumberId;
+	/** 编码 */
+	@ApiModelProperty("编码")
+	private String code;
+	/** 考试次数 */
+	@ApiModelProperty("考试次数")
+	private Long examNumber;
+	/** 前培次数 */
+	@ApiModelProperty("前培次数")
+	private Long doNumber;
+	/** 1启用 0关闭 */
+	@ApiModelProperty("1启用 0关闭")
+	private List<Integer> status;
+	/** 商品类型 1视频2题库 3补考 4前培  */
+	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
+	private Integer goodsType;
+	/** 教育类型id */
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 项目ID */
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+	/** 项目ID */
+	@ApiModelProperty("项目ID")
+	private Long goodsId;
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamSiteAddBo.java

@@ -0,0 +1,39 @@
+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_site
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@ApiModel("考试地点添加对象")
+public class ExamSiteAddBo {
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String siteAddress;
+    /** 人数 */
+    @ApiModelProperty("人数")
+    private Long people;
+    /** 1启用 0关闭 -1删除 */
+    @ApiModelProperty("1启用 0关闭 -1删除")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

+ 45 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamSiteEditBo.java

@@ -0,0 +1,45 @@
+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_site
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@ApiModel("考试地点编辑对象")
+public class ExamSiteEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long siteId;
+
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String siteAddress;
+
+    /** 人数 */
+    @ApiModelProperty("人数")
+    private Long people;
+
+    /** 1启用 0关闭 -1删除 */
+    @ApiModelProperty("1启用 0关闭 -1删除")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

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

@@ -0,0 +1,51 @@
+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_site
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试地点分页查询对象")
+public class ExamSiteQueryBo 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 code;
+	/** 地址 */
+	@ApiModelProperty("地址")
+	private String siteAddress;
+	/** 人数 */
+	@ApiModelProperty("人数")
+	private Long people;
+	/** 1启用 0关闭 -1删除 */
+	@ApiModelProperty("1启用 0关闭 -1删除")
+	private Integer status;
+}

+ 51 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamNumber.java

@@ -0,0 +1,51 @@
+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_number
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_number")
+public class ExamNumber implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "exam_number_id")
+    private Long examNumberId;
+    /** 编码 */
+    private String code;
+    /** 考试次数 */
+    private Long examNumber;
+    /** 前培次数 */
+    private Long doNumber;
+    /** 1启用 0关闭 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 商品类型 1视频2题库 3补考 4前培  */
+    private Integer goodsType;
+    /** 教育类型id */
+    private Long educationTypeId;
+    /** 业务层次id */
+    private Long businessId;
+    /** 项目ID */
+    private Long projectId;
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamNumberGoods.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_number_goods
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_number_goods")
+public class ExamNumberGoods implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 绑定考试次数配置 */
+    private Long examNumberId;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    private Long goodsId;
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamSite.java

@@ -0,0 +1,43 @@
+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_site
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_site")
+public class ExamSite implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "site_id")
+    private Long siteId;
+    /** 编码 */
+    private String code;
+    /** 地址 */
+    private String siteAddress;
+    /** 人数 */
+    private Long people;
+    /** 1启用 0关闭 -1删除 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

+ 21 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamNumberGoodsMapper.java

@@ -0,0 +1,21 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
+import com.zhongzheng.modules.exam.domain.ExamNumberGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
+
+import java.util.List;
+
+/**
+ * 考试配置绑定商品Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+public interface ExamNumberGoodsMapper extends BaseMapper<ExamNumberGoods> {
+
+    List<ExamNumberGoodsVo> ListExamNumber(Long examNumberId);
+
+    List<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo);
+}

+ 19 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamNumberMapper.java

@@ -0,0 +1,19 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.bo.ExamNumberQueryBo;
+import com.zhongzheng.modules.exam.domain.ExamNumber;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.exam.vo.ExamNumberVo;
+
+import java.util.List;
+
+/**
+ * 考试次数配置Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+public interface ExamNumberMapper extends BaseMapper<ExamNumber> {
+
+    List<ExamNumberVo> ListExamNumber(ExamNumberQueryBo bo);
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/mapper/ExamSiteMapper.java

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

+ 56 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamNumberGoodsService.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamNumberGoods;
+import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
+import com.zhongzheng.modules.exam.bo.ExamNumberGoodsQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamNumberGoodsAddBo;
+import com.zhongzheng.modules.exam.bo.ExamNumberGoodsEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试配置绑定商品Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+public interface IExamNumberGoodsService extends IService<ExamNumberGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamNumberGoodsVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamNumberGoodsVo> queryList(ExamNumberGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试配置绑定商品
+	 * @param bo 考试配置绑定商品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamNumberGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试配置绑定商品
+	 * @param bo 考试配置绑定商品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamNumberGoodsEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<ExamNumberGoodsVo> ListExamNumber(Long examNumberId);
+
+	List<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo);
+}

+ 54 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamNumberService.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamNumber;
+import com.zhongzheng.modules.exam.vo.ExamNumberVo;
+import com.zhongzheng.modules.exam.bo.ExamNumberQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamNumberAddBo;
+import com.zhongzheng.modules.exam.bo.ExamNumberEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试次数配置Service接口
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+public interface IExamNumberService extends IService<ExamNumber> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamNumberVo queryById(Long examNumberId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamNumberVo> queryList(ExamNumberQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试次数配置
+	 * @param bo 考试次数配置新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamNumberAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试次数配置
+	 * @param bo 考试次数配置编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamNumberEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<ExamNumberVo> ListExamNumber(ExamNumberQueryBo bo);
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/IExamSiteService.java

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

+ 111 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamNumberGoodsServiceImpl.java

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

+ 164 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamNumberServiceImpl.java

@@ -0,0 +1,164 @@
+package com.zhongzheng.modules.exam.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.modules.exam.bo.ExamNumberGoodsAddBo;
+import com.zhongzheng.modules.exam.domain.ExamNumberGoods;
+import com.zhongzheng.modules.exam.service.IExamNumberGoodsService;
+import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
+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.ExamNumberAddBo;
+import com.zhongzheng.modules.exam.bo.ExamNumberQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamNumberEditBo;
+import com.zhongzheng.modules.exam.domain.ExamNumber;
+import com.zhongzheng.modules.exam.mapper.ExamNumberMapper;
+import com.zhongzheng.modules.exam.vo.ExamNumberVo;
+import com.zhongzheng.modules.exam.service.IExamNumberService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试次数配置Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Service
+public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNumber> implements IExamNumberService {
+
+    @Autowired
+    private IExamNumberGoodsService examNumberGoodsService;
+
+
+    @Override
+    public ExamNumberVo queryById(Long examNumberId){
+        ExamNumber db = this.baseMapper.selectById(examNumberId);
+        return BeanUtil.toBean(db, ExamNumberVo.class);
+    }
+
+    @Override
+    public List<ExamNumberVo> queryList(ExamNumberQueryBo bo) {
+        LambdaQueryWrapper<ExamNumber> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getCode()), ExamNumber::getCode, bo.getCode());
+        lqw.eq(bo.getExamNumber() != null, ExamNumber::getExamNumber, bo.getExamNumber());
+        lqw.eq(bo.getDoNumber() != null, ExamNumber::getDoNumber, bo.getDoNumber());
+        lqw.eq(bo.getStatus() != null, ExamNumber::getStatus, bo.getStatus());
+        lqw.eq(bo.getGoodsType() != null, ExamNumber::getGoodsType, bo.getGoodsType());
+        lqw.eq(bo.getEducationTypeId() != null, ExamNumber::getEducationTypeId, bo.getEducationTypeId());
+        lqw.eq(bo.getBusinessId() != null, ExamNumber::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getProjectId() != null, ExamNumber::getProjectId, bo.getProjectId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamNumberVo> entity2Vo(Collection<ExamNumber> collection) {
+        List<ExamNumberVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamNumberVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamNumber> page = (Page<ExamNumber>)collection;
+            Page<ExamNumberVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByAddBo(ExamNumberAddBo bo) {
+        ExamNumber add = BeanUtil.toBean(bo, ExamNumber.class);
+        validEntityBeforeSave(add);
+        add.setCode(ServletUtils.getEncoded("KC"));
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        boolean save = this.save(add);
+        for (Long goodsId : bo.getGoodsId()) {
+            ExamNumberGoodsAddBo examNumberGoodsAddBo = new ExamNumberGoodsAddBo();
+            examNumberGoodsAddBo.setGoodsId(goodsId);
+            examNumberGoodsAddBo.setExamNumberId(add.getExamNumberId());
+            examNumberGoodsAddBo.setCreateTime(DateUtils.getNowTime());
+            examNumberGoodsAddBo.setUpdateTime(DateUtils.getNowTime());
+            examNumberGoodsService.insertByAddBo(examNumberGoodsAddBo);
+        }
+        return save;
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamNumberEditBo bo) {
+        ExamNumber update = BeanUtil.toBean(bo, ExamNumber.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        if (bo.getGoodsId() != null){
+            LambdaQueryWrapper<ExamNumberGoods> lqw = Wrappers.lambdaQuery();
+            lqw.eq(ExamNumberGoods::getExamNumberId, bo.getExamNumberId());
+            examNumberGoodsService.remove(lqw);
+            for (Long goodsId : bo.getGoodsId()) {
+                if (bo.getStatus() == 1) {
+                    ExamNumberQueryBo examNumberQueryBo = new ExamNumberQueryBo();
+                    List<Integer> status = new ArrayList<>();
+                    status.add(1);
+                    examNumberQueryBo.setStatus(status);
+                    examNumberQueryBo.setGoodsId(goodsId);
+                    List<ExamNumberVo> examNumberVos = baseMapper.ListExamNumber(examNumberQueryBo);
+                    if (CollectionUtils.isNotEmpty(examNumberVos)) {
+                        throw new IllegalArgumentException("考次存在商品已启用考次配置,不可开启,请重新创建新的考次配置商品");
+                    }
+                }
+                ExamNumberGoodsAddBo examNumberGoodsAddBo = new ExamNumberGoodsAddBo();
+                examNumberGoodsAddBo.setGoodsId(goodsId);
+                examNumberGoodsAddBo.setExamNumberId(update.getExamNumberId());
+                examNumberGoodsAddBo.setCreateTime(DateUtils.getNowTime());
+                examNumberGoodsAddBo.setUpdateTime(DateUtils.getNowTime());
+                examNumberGoodsService.insertByAddBo(examNumberGoodsAddBo);
+            }
+        }
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamNumber entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public List<ExamNumberVo> ListExamNumber(ExamNumberQueryBo bo) {
+        List<ExamNumberVo> examNumberVos = baseMapper.ListExamNumber(bo);
+        for (ExamNumberVo examNumberVo : examNumberVos) {
+            List<ExamNumberGoodsVo> examNumberGoodsVos = examNumberGoodsService.ListExamNumber(examNumberVo.getExamNumberId());
+            examNumberVo.setExamNumberGoodsVos(examNumberGoodsVos);
+        }
+        return examNumberVos;
+    }
+}

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

@@ -0,0 +1,104 @@
+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 com.zhongzheng.common.utils.ServletUtils;
+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.ExamSiteAddBo;
+import com.zhongzheng.modules.exam.bo.ExamSiteQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamSiteEditBo;
+import com.zhongzheng.modules.exam.domain.ExamSite;
+import com.zhongzheng.modules.exam.mapper.ExamSiteMapper;
+import com.zhongzheng.modules.exam.vo.ExamSiteVo;
+import com.zhongzheng.modules.exam.service.IExamSiteService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试地点Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Service
+public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteMapper, ExamSite> implements IExamSiteService {
+
+    @Override
+    public ExamSiteVo queryById(Long siteId){
+        ExamSite db = this.baseMapper.selectById(siteId);
+        return BeanUtil.toBean(db, ExamSiteVo.class);
+    }
+
+    @Override
+    public List<ExamSiteVo> queryList(ExamSiteQueryBo bo) {
+        LambdaQueryWrapper<ExamSite> lqw = Wrappers.lambdaQuery();
+        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());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamSiteVo> entity2Vo(Collection<ExamSite> collection) {
+        List<ExamSiteVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamSiteVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamSite> page = (Page<ExamSite>)collection;
+            Page<ExamSiteVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamSiteAddBo bo) {
+        ExamSite add = BeanUtil.toBean(bo, ExamSite.class);
+        validEntityBeforeSave(add);
+        add.setCode(ServletUtils.getEncoded("DD"));
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamSiteEditBo bo) {
+        ExamSite update = BeanUtil.toBean(bo, ExamSite.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamSite entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 57 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamNumberGoodsVo.java

@@ -0,0 +1,57 @@
+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.math.BigDecimal;
+import java.util.Date;
+
+
+
+/**
+ * 考试配置绑定商品视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@ApiModel("考试配置绑定商品视图对象")
+public class ExamNumberGoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 绑定考试次数配置 */
+	@Excel(name = "绑定考试次数配置")
+	@ApiModelProperty("绑定考试次数配置")
+	private Long examNumberId;
+	/** $column.columnComment */
+	@Excel(name = "绑定考试次数配置")
+	@ApiModelProperty("$column.columnComment")
+	private Long goodsId;
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+
+	/** 标准价格 */
+	@Excel(name = "标准价格")
+	@ApiModelProperty("标准价格")
+	private BigDecimal standPrice;
+
+	/** 1可选 0不可选 */
+	@Excel(name = "1可选 0不可选")
+	@ApiModelProperty("1可选 0不可选")
+	private Integer goodsStatus;
+}

+ 71 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamNumberVo.java

@@ -0,0 +1,71 @@
+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;
+import java.util.List;
+
+
+/**
+ * 考试次数配置视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-12-06
+ */
+@Data
+@ApiModel("考试次数配置视图对象")
+public class ExamNumberVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long examNumberId;
+
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+	/** 考试次数 */
+	@Excel(name = "考试次数")
+	@ApiModelProperty("考试次数")
+	private Long examNumber;
+	/** 前培次数 */
+	@Excel(name = "前培次数")
+	@ApiModelProperty("前培次数")
+	private Long doNumber;
+	/** 1启用 0关闭 */
+	@Excel(name = "1启用 0关闭")
+	@ApiModelProperty("1启用 0关闭")
+	private Integer status;
+	/** 商品类型 1视频2题库 3补考 4前培  */
+	@Excel(name = "商品类型 1视频2题库 3补考 4前培 ")
+	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
+	private Integer goodsType;
+	/** 教育类型id */
+	@Excel(name = "教育类型id")
+	@ApiModelProperty("教育类型id")
+	private Long educationTypeId;
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("项目ID")
+	private Long projectId;
+
+	@ApiModelProperty("教育类型名称")
+	private String educationName;
+	@ApiModelProperty("项目名称")
+	private String projectName;
+	@ApiModelProperty("业务名称")
+	private String businessName;
+
+	/** 项目ID */
+	@Excel(name = "项目ID")
+	@ApiModelProperty("考次绑定商品")
+	private List<ExamNumberGoodsVo> examNumberGoodsVos;
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/vo/ExamSiteVo.java

@@ -0,0 +1,43 @@
+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-06
+ */
+@Data
+@ApiModel("考试地点视图对象")
+public class ExamSiteVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long siteId;
+
+	/** 编码 */
+	@Excel(name = "编码")
+	@ApiModelProperty("编码")
+	private String code;
+	/** 地址 */
+	@Excel(name = "地址")
+	@ApiModelProperty("地址")
+	private String siteAddress;
+	/** 人数 */
+	@Excel(name = "人数")
+	@ApiModelProperty("人数")
+	private Long people;
+	/** 1启用 0关闭 -1删除 */
+	@Excel(name = "1启用 0关闭 -1删除")
+	@ApiModelProperty("1启用 0关闭 -1删除")
+	private Integer status;
+}

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -45,6 +45,7 @@ import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.zhongzheng.modules.grade.mapper.ClassGradeMapper;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -126,6 +127,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ClassGradeAddBo bo) {
         ClassGrade add = BeanUtil.toBean(bo, ClassGrade.class);
         validEntityBeforeSave(add);
@@ -167,6 +169,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(ClassGradeEditBo bo) {
         ClassGrade update = BeanUtil.toBean(bo, ClassGrade.class);
         validEntityBeforeSave(update);
@@ -261,6 +264,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean editUserGrade(ClassGradeUserAddQueryBo bo) {
         for (Long aLong : bo.getUserId()) {
             ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -18,6 +18,7 @@ import com.zhongzheng.modules.grade.domain.UserPeriod;
 import com.zhongzheng.modules.grade.mapper.UserPeriodMapper;
 import com.zhongzheng.modules.grade.vo.UserPeriodVo;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -87,6 +88,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(UserPeriodEditBo bo) {
             for (Long aLong : bo.getId()) {
                 UserPeriodStatus userPeriodStatus = new UserPeriodStatus();
@@ -119,6 +121,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean editPeriodAll(UserPeriodEditBo bo) {
             LambdaQueryWrapper<UserPeriod> lqw = Wrappers.lambdaQuery();
             lqw.eq(bo.getUserId() != null, UserPeriod::getUserId, bo.getUserId());

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformClassifyServiceImpl.java

@@ -17,6 +17,7 @@ import com.zhongzheng.modules.inform.domain.InformClassify;
 import com.zhongzheng.modules.inform.mapper.InformClassifyMapper;
 import com.zhongzheng.modules.inform.vo.InformClassifyVo;
 import com.zhongzheng.modules.inform.service.IInformClassifyService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -77,6 +78,7 @@ public class InformClassifyServiceImpl extends ServiceImpl<InformClassifyMapper,
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(InformClassifyEditBo bo) {
         InformClassify update = BeanUtil.toBean(bo, InformClassify.class);
         validEntityBeforeSave(update);

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java

@@ -163,6 +163,7 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(InformEditBo bo) {
         if (bo.getStatus() == -1){
             for (Long informId : bo.getInformIds()) {

+ 65 - 0
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamNumberGoodsMapper.xml

@@ -0,0 +1,65 @@
+<?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.ExamNumberGoodsMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamNumberGoods" id="ExamNumberGoodsResult">
+        <result property="id" column="id"/>
+        <result property="examNumberId" column="exam_number_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="goodsId" column="goods_id"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
+        <result property="id" column="id"/>
+        <result property="examNumberId" column="exam_number_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="code" column="code"/>
+        <result property="standPrice" column="stand_price"/>
+        <result property="goodsStatus" column="goods_status"/>
+    </resultMap>
+
+
+
+    <select id="ListExamNumber" parameterType="com.zhongzheng.modules.exam.bo.ExamNumberQueryBo" resultMap="ExamNumberGoodsVoResult">
+        SELECT
+        *,
+        (SELECT goods_name FROM goods g where eng.goods_id = g.goods_id) as goods_name,
+        (SELECT code FROM goods g where eng.goods_id = g.goods_id) as code,
+        (SELECT stand_price FROM goods g where eng.goods_id = g.goods_id) as stand_price
+        FROM
+        exam_number_goods eng
+        WHERE
+            1=1
+        <if test="examNumberId != null and examNumberId != ''">
+            AND eng.exam_number_id = #{examNumberId}
+        </if>
+    </select>
+
+    <select id="listGoods" parameterType="com.zhongzheng.modules.exam.bo.ExamNumberQueryBo" resultMap="ExamNumberGoodsVoResult">
+        SELECT
+            goods_id,
+            goods_name,
+            CODE,
+            stand_price,
+            (case WHEN (SELECT COUNT(en.exam_number_id) FROM exam_number en LEFT JOIN exam_number_goods eng on en.exam_number_id =eng.exam_number_id where 1=1 and eng.goods_id = g.goods_id  ) >0 then 0 ELSE 1 end) as goods_status
+        FROM
+            goods g
+        WHERE
+            1 = 1
+        and g.status in(1)
+        <if test="businessId != null and businessId != ''">
+          and g.business_id = #{businessId}
+        </if>
+        <if test="projectId != null and projectId != ''">
+          and g.project_id = #{projectId}
+        </if>
+        <if test="goodsType != null and goodsType != ''">
+          and g.goods_type = #{goodsType}
+        </if>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,54 @@
+<?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.ExamNumberMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamNumber" id="ExamNumberResult">
+        <result property="examNumberId" column="exam_number_id"/>
+        <result property="code" column="code"/>
+        <result property="examNumber" column="exam_number"/>
+        <result property="doNumber" column="do_number"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="goodsType" column="goods_type"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="projectId" column="project_id"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberVo" id="ExamNumberVoResult">
+        <result property="examNumberId" column="exam_number_id"/>
+        <result property="code" column="code"/>
+        <result property="examNumber" column="exam_number"/>
+        <result property="doNumber" column="do_number"/>
+        <result property="status" column="status"/>
+        <result property="goodsType" column="goods_type"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="projectId" column="project_id"/>
+    </resultMap>
+
+    <select id="ListExamNumber" parameterType="com.zhongzheng.modules.exam.bo.ExamNumberQueryBo" resultMap="ExamNumberVoResult">
+        SELECT
+            *,
+            (SELECT cet.education_name FROM course_education_type cet where cet.id = en.education_type_id) as education_name,
+            (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
+        <if test="status != null and status.size()!=0 ">
+            WHERE en.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="examNumberId != null and examNumberId != ''">
+            AND en.exam_number_id = #{examNumberId}
+        </if>
+        <if test="goodsId != null and goodsId != ''">
+            AND  AND  (SELECT COUNT(eng.id) FROM exam_number_goods eng where eng.goods_id =#{goodsId}) > 0
+        </if>
+    </select>
+</mapper>

+ 18 - 0
zhongzheng-system/src/main/resources/mapper/modules/exam/ExamSiteMapper.xml

@@ -0,0 +1,18 @@
+<?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.ExamSiteMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamSite" id="ExamSiteResult">
+        <result property="siteId" column="site_id"/>
+        <result property="code" column="code"/>
+        <result property="siteAddress" column="site_address"/>
+        <result property="people" column="people"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>