接口逻辑完善，考试安排后台功能接口

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityConfigurationController.java

@@ -59,7 +59,7 @@ public class ActivityConfigurationController extends BaseController {
     /**
      * 导出活动配置列表
      */
- /*   @ApiOperation("导出活动配置列表")
+ /* @ApiOperation("导出活动配置列表")
     @PreAuthorize("@ss.hasPermi('system:configuration:export')")
     @Log(title = "活动配置", businessType = BusinessType.EXPORT)
     @GetMapping("/export")

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityGradeController.java

@@ -31,7 +31,7 @@ import io.swagger.annotations.ApiOperation;
 /**
  * 等级积分Controller
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Api(value = "等级积分控制器", tags = {"等级积分管理"})
@@ -83,7 +83,7 @@ public class ActivityGradeController extends BaseController {
     @ApiOperation("新增等级积分")
     @PreAuthorize("@ss.hasPermi('system:grade:add')")
     @Log(title = "等级积分", businessType = BusinessType.INSERT)
-    @PostMapping()
+    @PostMapping("/addGrade")
     public AjaxResult<Void> add(@RequestBody ActivityGradeAddBo bo) {
         return toAjax(iActivityGradeService.insertByAddBo(bo) ? 1 : 0);
     }
@@ -94,7 +94,7 @@ public class ActivityGradeController extends BaseController {
     @ApiOperation("修改等级积分")
     @PreAuthorize("@ss.hasPermi('system:grade:edit')")
     @Log(title = "等级积分", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/editGrade")
     public AjaxResult<Void> edit(@RequestBody ActivityGradeEditBo bo) {
         return toAjax(iActivityGradeService.updateByEditBo(bo) ? 1 : 0);
     }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityTaskController.java

@@ -31,7 +31,7 @@ import io.swagger.annotations.ApiOperation;
 /**
  * 任务存储Controller
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Api(value = "任务存储控制器", tags = {"任务存储管理"})
@@ -57,7 +57,7 @@ public class ActivityTaskController extends BaseController {
     /**
      * 导出任务存储列表
      */
-    @ApiOperation("导出任务存储列表")
+  /*  @ApiOperation("导出任务存储列表")
     @PreAuthorize("@ss.hasPermi('modules.activity:task:export')")
     @Log(title = "任务存储", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
@@ -65,7 +65,7 @@ public class ActivityTaskController extends BaseController {
         List<ActivityTaskVo> list = iActivityTaskService.queryList(bo);
         ExcelUtil<ActivityTaskVo> util = new ExcelUtil<ActivityTaskVo>(ActivityTaskVo.class);
         return util.exportExcel(list, "任务存储");
-    }
+    }*/
 
     /**
      * 获取任务存储详细信息
@@ -83,7 +83,7 @@ public class ActivityTaskController extends BaseController {
     @ApiOperation("新增任务存储")
     @PreAuthorize("@ss.hasPermi('modules.activity:task:add')")
     @Log(title = "任务存储", businessType = BusinessType.INSERT)
-    @PostMapping()
+    @PostMapping("/addTask")
     public AjaxResult<Void> add(@RequestBody ActivityTaskAddBo bo) {
         return toAjax(iActivityTaskService.insertByAddBo(bo) ? 1 : 0);
     }
@@ -94,7 +94,7 @@ public class ActivityTaskController extends BaseController {
     @ApiOperation("修改任务存储")
     @PreAuthorize("@ss.hasPermi('modules.activity:task:edit')")
     @Log(title = "任务存储", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/editTask")
     public AjaxResult<Void> edit(@RequestBody ActivityTaskEditBo bo) {
         return toAjax(iActivityTaskService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -102,11 +102,11 @@ public class ActivityTaskController extends BaseController {
     /**
      * 删除任务存储
      */
-    @ApiOperation("删除任务存储")
+/*    @ApiOperation("删除任务存储")
     @PreAuthorize("@ss.hasPermi('modules.activity:task:remove')")
     @Log(title = "任务存储" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iActivityTaskService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
+    }*/
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/alioss/OssController.java

@@ -32,7 +32,7 @@ public class OssController {
     private final OssService ossService;
 
     /**
-     * policy
+     * policy获得
      */
     @ApiOperation("policy获得")
     @GetMapping("/policy")
@@ -42,6 +42,9 @@ public class OssController {
         return AjaxResult.success(result);
     }
 
+    /**
+     * 阿里回调OSS返回参数到前端
+     */
     @ApiOperation("回调")
     @PostMapping("/callback")
     public ResultBean callback(HttpServletRequest request) {

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

@@ -0,0 +1,112 @@
+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.ExamArrangementVo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementEditBo;
+import com.zhongzheng.modules.exam.service.IExamArrangementService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 考试安排，包含考试指引Controller
+ * 
+ * @author change
+ * @date 2021-05-19
+ */
+@Api(value = "考试安排，包含考试指引控制器", tags = {"考试安排，包含考试指引管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/modules.exam/arrangement")
+public class ExamArrangementController extends BaseController {
+
+    private final IExamArrangementService iExamArrangementService;
+
+    /**
+     * 查询考试安排，包含考试指引列表
+     */
+    @ApiOperation("查询考试安排，包含考试指引列表")
+    @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ExamArrangementVo> list(ExamArrangementQueryBo bo) {
+        startPage();
+        List<ExamArrangementVo> list = iExamArrangementService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出考试安排，包含考试指引列表
+     */
+    @ApiOperation("导出考试安排，包含考试指引列表")
+    @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:export')")
+    @Log(title = "考试安排，包含考试指引", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ExamArrangementVo> export(ExamArrangementQueryBo bo) {
+        List<ExamArrangementVo> list = iExamArrangementService.queryList(bo);
+        ExcelUtil<ExamArrangementVo> util = new ExcelUtil<ExamArrangementVo>(ExamArrangementVo.class);
+        return util.exportExcel(list, "考试安排，包含考试指引");
+    }
+
+    /**
+     * 获取考试安排，包含考试指引详细信息
+     */
+    @ApiOperation("获取考试安排，包含考试指引详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<ExamArrangementVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iExamArrangementService.queryById(id));
+    }
+
+    /**
+     * 新增考试安排，包含考试指引
+     */
+    @ApiOperation("新增考试安排，包含考试指引")
+    @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:add')")
+    @Log(title = "考试安排，包含考试指引", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ExamArrangementAddBo bo) {
+        return toAjax(iExamArrangementService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改考试安排，包含考试指引
+     */
+    @ApiOperation("修改考试安排，包含考试指引")
+    @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:edit')")
+    @Log(title = "考试安排，包含考试指引", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody ExamArrangementEditBo bo) {
+        return toAjax(iExamArrangementService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除考试安排，包含考试指引
+     */
+    @ApiOperation("删除考试安排，包含考试指引")
+    @PreAuthorize("@ss.hasPermi('modules.exam:arrangement:remove')")
+    @Log(title = "考试安排，包含考试指引" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iExamArrangementService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingAddBo.java

@@ -48,9 +48,6 @@ public class ActivityAdvertisingAddBo {
     /** 0删除 1待发布 2 撤回 3发布成功 */
     @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
     private Integer status;
-    /** 定时发布的时间 */
-    @ApiModelProperty("定时发布的时间")
-    private Long releaseTime;
     /** 广告名称 */
     @ApiModelProperty("广告名称")
     @NotNull(message = "广告名称 不能为空")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingEditBo.java

@@ -52,10 +52,6 @@ public class ActivityAdvertisingEditBo {
     @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
     private Integer status;
 
-    /** 定时发布的时间 */
-    @ApiModelProperty("定时发布的时间")
-    private Long releaseTime;
-
     /** 广告名称 */
     @ApiModelProperty("广告名称")
     private String advName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityAdvertisingQueryBo.java

@@ -52,9 +52,6 @@ public class ActivityAdvertisingQueryBo extends BaseEntity {
 	/** 0删除 1待发布 2 撤回 3发布成功 */
 	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
 	private Integer status;
-	/** 定时发布的时间 */
-	@ApiModelProperty("定时发布的时间")
-	private Long releaseTime;
 	/** 广告名称 */
 	@ApiModelProperty("广告名称")
 	private String advName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationAddBo.java

@@ -1,5 +1,9 @@
 package com.zhongzheng.modules.activity.bo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.course.domain.Course;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -7,7 +11,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -66,4 +70,10 @@ public class ActivityConfigurationAddBo {
     /** 0删除 1结束 2 撤回 3开始 4未开始 */
     @ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
     private Integer status;
+
+    /** 绑定课程 */
+    @Excel(name = "绑定课程")
+    @ApiModelProperty("绑定课程")
+    private String[] coursesId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationCourseAddBo.java

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 活动配置关联课程包含范围添加对象 activity_configuration_course
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("活动配置关联课程包含范围添加对象")
+public class ActivityConfigurationCourseAddBo {
+    /** 活动配置id */
+    @ApiModelProperty("活动配置id")
+    private Long configurationId;
+
+    /** 关联课程id */
+    @ApiModelProperty("关联课程id")
+    private Long courseId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationCourseEditBo.java

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 活动配置关联课程包含范围编辑对象 activity_configuration_course
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("活动配置关联课程包含范围编辑对象")
+public class ActivityConfigurationCourseEditBo {
+
+
+    /** 活动配置id */
+    @ApiModelProperty("活动配置id")
+    private Long configurationId;
+
+    /** 关联课程id */
+    @ApiModelProperty("关联课程id")
+    private Long courseId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationCourseQueryBo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.activity.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;
+
+/**
+ * 活动配置关联课程包含范围分页查询对象 activity_configuration_course
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("活动配置关联课程包含范围分页查询对象")
+public class ActivityConfigurationCourseQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationEditBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.activity.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -73,4 +74,10 @@ public class ActivityConfigurationEditBo {
     /** 0删除 1结束 2 撤回 3开始 4未开始 */
     @ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
     private Integer status;
+
+    /** 绑定课程 */
+    @Excel(name = "绑定课程")
+    @ApiModelProperty("绑定课程")
+    private String[] coursesId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityConfigurationQueryBo.java

@@ -36,6 +36,9 @@ public class ActivityConfigurationQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** 活动名称 */
+	@ApiModelProperty("id")
+	private Integer id;
 	/** 活动名称 */
 	@ApiModelProperty("活动名称")
 	private String activityName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradeAddBo.java

@@ -1,23 +1,26 @@
 package com.zhongzheng.modules.activity.bo;
 
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo;
 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;
 
 
 /**
  * 等级积分添加对象 activity_grade
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Data
 @ApiModel("等级积分添加对象")
 public class ActivityGradeAddBo {
 
+
     /** 等级 */
     @ApiModelProperty("等级")
     private Integer grade;
@@ -39,4 +42,8 @@ public class ActivityGradeAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+
+    @Excel(name = "关联特权类型")
+    @ApiModelProperty("关联特权类型")
+    private List<ActivityGradePrivilegeAddBo> activityGradePrivilegeAddBos;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradeEditBo.java

@@ -1,16 +1,18 @@
 package com.zhongzheng.modules.activity.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 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;
 
 
 /**
  * 等级积分编辑对象 activity_grade
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Data
@@ -45,4 +47,10 @@ public class ActivityGradeEditBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+
+    @Excel(name = "关联特权类型")
+    @ApiModelProperty("关联特权类型")
+    private List<ActivityGradePrivilegeEditBo> activityGradePrivilegeEditBos;
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeAddBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.activity.bo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 等级积分特权类型：优惠券，折扣券等类型添加对象 activity_grade_privilege
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("等级积分特权类型：优惠券，折扣券等类型添加对象")
+public class ActivityGradePrivilegeAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    @TableId()
+    private Long id;
+    /** 关联积分表id */
+    @ApiModelProperty("关联积分表id")
+    private Long gradeId;
+    /** 特权类型 */
+    @ApiModelProperty("特权类型")
+    private String priType;
+    /** 优惠券金额 */
+    @ApiModelProperty("优惠券金额")
+    private Long couponPrice;
+    /** 折扣 */
+    @ApiModelProperty("折扣")
+    private Integer discount;
+    /** 有效期几个月 */
+    @ApiModelProperty("有效期几个月")
+    private Integer endTimeSum;
+    /** 发放数量 */
+    @ApiModelProperty("发放数量")
+    private Integer quantity;
+
+    /** 绑定课程 */
+    @ApiModelProperty("绑定课程")
+    private String[] courseIds;
+
+    /** 0删除 1使用 */
+    @ApiModelProperty("0删除 1使用")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeCouresAddBo.java

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 积分关联特权的范围课程添加对象 activity_grade_privilege_coures
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("积分关联特权的范围课程添加对象")
+public class ActivityGradePrivilegeCouresAddBo {
+    /** 活动配置id */
+    @ApiModelProperty("活动配置id")
+    private Long privilegeId;
+
+    /** 关联课程id */
+    @ApiModelProperty("关联课程id")
+    private Long courseId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeCouresEditBo.java

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 积分关联特权的范围课程编辑对象 activity_grade_privilege_coures
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("积分关联特权的范围课程编辑对象")
+public class ActivityGradePrivilegeCouresEditBo {
+
+
+    /** 活动配置id */
+    @ApiModelProperty("活动配置id")
+    private Long privilegeId;
+
+    /** 关联课程id */
+    @ApiModelProperty("关联课程id")
+    private Long courseId;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeCouresQueryBo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.activity.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;
+
+/**
+ * 积分关联特权的范围课程分页查询对象 activity_grade_privilege_coures
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("积分关联特权的范围课程分页查询对象")
+public class ActivityGradePrivilegeCouresQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeEditBo.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 等级积分特权类型：优惠券，折扣券等类型编辑对象 activity_grade_privilege
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("等级积分特权类型：优惠券，折扣券等类型编辑对象")
+public class ActivityGradePrivilegeEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 关联积分表id */
+    @ApiModelProperty("关联积分表id")
+    private Long gradeId;
+
+    /** 特权类型 */
+    @ApiModelProperty("特权类型")
+    private String priType;
+
+    /** 优惠券金额 */
+    @ApiModelProperty("优惠券金额")
+    private Long couponPrice;
+
+    /** 折扣 */
+    @ApiModelProperty("折扣")
+    private Integer discount;
+
+    /** 有效期几个月 */
+    @ApiModelProperty("有效期几个月")
+    private Integer endTimeSum;
+
+    /** 发放数量 */
+    @ApiModelProperty("发放数量")
+    private Integer quantity;
+
+    /** 绑定课程 */
+    @ApiModelProperty("绑定课程")
+    private String[] courseIds;
+
+    /** 0删除 1使用 */
+    @ApiModelProperty("0删除 1使用")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradePrivilegeQueryBo.java

@@ -0,0 +1,61 @@
+package com.zhongzheng.modules.activity.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;
+
+/**
+ * 等级积分特权类型：优惠券，折扣券等类型分页查询对象 activity_grade_privilege
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("等级积分特权类型：优惠券，折扣券等类型分页查询对象")
+public class ActivityGradePrivilegeQueryBo 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 gradeId;
+	/** 特权类型 */
+	@ApiModelProperty("特权类型")
+	private String priType;
+	/** 优惠券金额 */
+	@ApiModelProperty("优惠券金额")
+	private Long couponPrice;
+	/** 折扣 */
+	@ApiModelProperty("折扣")
+	private Integer discount;
+	/** 有效期几个月 */
+	@ApiModelProperty("有效期几个月")
+	private Integer endTimeSum;
+	/** 发放数量 */
+	@ApiModelProperty("发放数量")
+	private Integer quantity;
+	/** 0删除 1使用 */
+	@ApiModelProperty("0删除 1使用")
+	private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityGradeQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 等级积分分页查询对象 activity_grade
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskAddBo.java

@@ -1,17 +1,19 @@
 package com.zhongzheng.modules.activity.bo;
 
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
 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;
 
 
 /**
  * 任务存储添加对象 activity_task
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Data
@@ -19,7 +21,8 @@ import java.util.Date;
 public class ActivityTaskAddBo {
 
     /** 任务名称 */
-    @ApiModelProperty("任务名称")
+    @ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
+            "4视频学习 5模拟考试")
     private Integer taskType;
     /** 奖励积分 */
     @ApiModelProperty("奖励积分")
@@ -51,4 +54,9 @@ public class ActivityTaskAddBo {
     /** 0 停用 1启用 */
     @ApiModelProperty("0 停用 1启用")
     private Integer status;
+
+    /** 分数范围 适用与考试积分获得 */
+    @Excel(name = "分数范围 适用与考试积分获得")
+    @ApiModelProperty("分数范围 适用与考试积分获得")
+    private List<ActivityTaskTimeAddBo> activityTaskTimeAddBo;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskEditBo.java

@@ -1,16 +1,18 @@
 package com.zhongzheng.modules.activity.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 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;
 
 
 /**
  * 任务存储编辑对象 activity_task
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Data
@@ -23,7 +25,8 @@ public class ActivityTaskEditBo {
     private Long id;
 
     /** 任务名称 */
-    @ApiModelProperty("任务名称")
+    @ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
+            "4视频学习 5模拟考试")
     private Integer taskType;
 
     /** 奖励积分 */
@@ -61,4 +64,9 @@ public class ActivityTaskEditBo {
     /** 0 停用 1启用 */
     @ApiModelProperty("0 停用 1启用")
     private Integer status;
+
+    /** 分数范围 适用与考试积分获得 */
+    @Excel(name = "分数范围 适用与考试积分获得")
+    @ApiModelProperty("分数范围 适用与考试积分获得")
+    private List<ActivityTaskTimeEditBo> activityTaskTimeEditBoList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskQueryBo.java

@@ -14,7 +14,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 /**
  * 任务存储分页查询对象 activity_task
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Data
@@ -37,7 +37,8 @@ public class ActivityTaskQueryBo extends BaseEntity {
 
 
 	/** 任务名称 */
-	@ApiModelProperty("任务名称")
+	@ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
+			"4视频学习 5模拟考试")
 	private Integer taskType;
 	/** 奖励积分 */
 	@ApiModelProperty("奖励积分")

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskTimeAddBo.java

@@ -0,0 +1,30 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 模拟考试分数给予积分关联添加对象 activity_task_time
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("模拟考试分数给予积分关联添加对象")
+public class ActivityTaskTimeAddBo {
+
+    /** 分数最低范围 */
+    @ApiModelProperty("分数最低范围")
+    private Integer startRange;
+    /** 分数最高范围 */
+    @ApiModelProperty("分数最高范围")
+    private Integer endRange;
+    /** 奖励积分 */
+    @ApiModelProperty("奖励积分")
+    private Integer integral;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskTimeEditBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.activity.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 模拟考试分数给予积分关联编辑对象 activity_task_time
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("模拟考试分数给予积分关联编辑对象")
+public class ActivityTaskTimeEditBo {
+
+
+    /** 任务ID */
+    @ApiModelProperty("任务ID")
+    private Long taskId;
+
+    /** 分数最低范围 */
+    @ApiModelProperty("分数最低范围")
+    private Integer startRange;
+
+    /** 分数最高范围 */
+    @ApiModelProperty("分数最高范围")
+    private Integer endRange;
+
+    /** 奖励积分 */
+    @ApiModelProperty("奖励积分")
+    private Integer integral;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/bo/ActivityTaskTimeQueryBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.activity.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;
+
+/**
+ * 模拟考试分数给予积分关联分页查询对象 activity_task_time
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("模拟考试分数给予积分关联分页查询对象")
+public class ActivityTaskTimeQueryBo 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 Integer startRange;
+	/** 分数最高范围 */
+	@ApiModelProperty("分数最高范围")
+	private Integer endRange;
+	/** 奖励积分 */
+	@ApiModelProperty("奖励积分")
+	private Integer integral;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityAdvertising.java

@@ -58,8 +58,7 @@ private static final long serialVersionUID=1L;
     /** 0删除 1待发布 2 撤回 3发布成功 */
     private Integer status;
 
-    /** 定时发布的时间 */
-    private Long releaseTime;
+
 
     /** 广告名称 */
     private String advName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfiguration.java

@@ -25,7 +25,7 @@ private static final long serialVersionUID=1L;
 
 
     /** $column.columnComment */
-    @TableId(value = "id")
+    @TableId(value = "id",type = IdType.AUTO)
     private Long id;
 
     /** 活动名称 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityConfigurationCourse.java

@@ -0,0 +1,34 @@
+package com.zhongzheng.modules.activity.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;
+
+/**
+ * 活动配置关联课程包含范围对象 activity_configuration_course
+ * 
+ * @author change
+ * @date 2021-05-19
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("activity_configuration_course")
+public class ActivityConfigurationCourse implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 活动配置id */
+    @TableId(value = "configuration_id")
+    private Long configurationId;
+
+    /** 关联课程id */
+    private Long courseId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGrade.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 等级积分对象 activity_grade
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Data

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGradePrivilege.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.activity.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;
+
+/**
+ * 等级积分特权类型：优惠券，折扣券等类型对象 activity_grade_privilege
+ * 
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("activity_grade_privilege")
+public class ActivityGradePrivilege implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 关联积分表id */
+    private Long gradeId;
+
+    /** 特权类型 */
+    private String priType;
+
+    /** 优惠券金额 */
+    private Long couponPrice;
+
+    /** 折扣 */
+    private Integer discount;
+
+    /** 有效期几个月 */
+    private Integer endTimeSum;
+
+    /** 发放数量 */
+    private Integer quantity;
+
+    /** 0删除 1使用 */
+    @ApiModelProperty("0删除 1使用")
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityGradePrivilegeCoures.java

@@ -0,0 +1,34 @@
+package com.zhongzheng.modules.activity.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;
+
+/**
+ * 积分关联特权的范围课程对象 activity_grade_privilege_coures
+ * 
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("activity_grade_privilege_coures")
+public class ActivityGradePrivilegeCoures implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 活动配置id */
+    @TableId(value = "privilege_id")
+    private Long privilegeId;
+
+    /** 关联课程id */
+    private Long courseId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityTask.java

@@ -12,7 +12,7 @@ import com.zhongzheng.common.annotation.Excel;
 /**
  * 任务存储对象 activity_task
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Data
@@ -28,7 +28,8 @@ private static final long serialVersionUID=1L;
     @TableId(value = "id")
     private Long id;
 
-    /** 任务名称 */
+    /** 任务名称 任务名称  0每日签到 1完善信息 2邀请好友 3每日分享
+     4视频学习 5模拟考试*/
     private Integer taskType;
 
     /** 奖励积分 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/domain/ActivityTaskTime.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.activity.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;
+
+/**
+ * 模拟考试分数给予积分关联对象 activity_task_time
+ * 
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("activity_task_time")
+public class ActivityTaskTime implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 任务ID */
+    @TableId(value = "task_id")
+    private Long taskId;
+
+    /** 分数最低范围 */
+    private Integer startRange;
+
+    /** 分数最高范围 */
+    private Integer endRange;
+
+    /** 奖励积分 */
+    private Integer integral;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationCourseMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.activity.mapper;
+
+import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 活动配置关联课程包含范围Mapper接口
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+public interface ActivityConfigurationCourseMapper extends BaseMapper<ActivityConfigurationCourse> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.activity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
 import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
+import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
+
+import java.util.Collection;
 
 /**
  * 活动配置Mapper接口
@@ -11,4 +15,19 @@ import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
  */
 public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfiguration> {
 
+    /**
+     * 查询配置分页
+     *
+     * @param bo 配置信息
+     * @return 配置信息集合信息
+     */
+    Collection<ActivityConfigurationVo> selectConfiguraList(ActivityConfigurationQueryBo bo);
+
+    /**
+     * 详细配置
+     *
+     * @param id 详细配置信息
+     * @return 详细配置
+     */
+    ActivityConfigurationVo selectConfigures(Long id);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradeMapper.java

@@ -1,14 +1,25 @@
 package com.zhongzheng.modules.activity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.activity.bo.ActivityGradeQueryBo;
 import com.zhongzheng.modules.activity.domain.ActivityGrade;
+import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
+
+import java.util.Collection;
 
 /**
  * 等级积分Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 public interface ActivityGradeMapper extends BaseMapper<ActivityGrade> {
 
+    /**
+     * 查询等级分页
+     *
+     * @param bo 等级信息
+     * @return 等级信息集合信息
+     */
+    Collection<ActivityGradeVo> selectGradeList(ActivityGradeQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeCouresMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.activity.mapper;
+
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 积分关联特权的范围课程Mapper接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface ActivityGradePrivilegeCouresMapper extends BaseMapper<ActivityGradePrivilegeCoures> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityGradePrivilegeMapper.java

@@ -0,0 +1,18 @@
+package com.zhongzheng.modules.activity.mapper;
+
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo;
+
+import java.util.List;
+
+/**
+ * 等级积分特权类型：优惠券，折扣券等类型Mapper接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface ActivityGradePrivilegeMapper extends BaseMapper<ActivityGradePrivilege> {
+
+    List<ActivityGradePrivilegeVo> selectGradePriList(Long id);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * 任务存储Mapper接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 public interface ActivityTaskMapper extends BaseMapper<ActivityTask> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityTaskTimeMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.activity.mapper;
+
+import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 模拟考试分数给予积分关联Mapper接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface ActivityTaskTimeMapper extends BaseMapper<ActivityTaskTime> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationCourseService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.activity.service;
+
+import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
+import com.zhongzheng.modules.activity.vo.ActivityConfigurationCourseVo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseQueryBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 活动配置关联课程包含范围Service接口
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+public interface IActivityConfigurationCourseService extends IService<ActivityConfigurationCourse> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityConfigurationCourseVo queryById(Long configurationId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ActivityConfigurationCourseVo> queryList(ActivityConfigurationCourseQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入活动配置关联课程包含范围
+	 * @param bo 活动配置关联课程包含范围新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ActivityConfigurationCourseAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改活动配置关联课程包含范围
+	 * @param bo 活动配置关联课程包含范围编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ActivityConfigurationCourseEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityGradePrivilegeCouresService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.activity.service;
+
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures;
+import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeCouresVo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresQueryBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 积分关联特权的范围课程Service接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface IActivityGradePrivilegeCouresService extends IService<ActivityGradePrivilegeCoures> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityGradePrivilegeCouresVo queryById(Long privilegeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ActivityGradePrivilegeCouresVo> queryList(ActivityGradePrivilegeCouresQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入积分关联特权的范围课程
+	 * @param bo 积分关联特权的范围课程新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ActivityGradePrivilegeCouresAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改积分关联特权的范围课程
+	 * @param bo 积分关联特权的范围课程编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ActivityGradePrivilegeCouresEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityGradePrivilegeService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.activity.service;
+
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
+import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeQueryBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 等级积分特权类型：优惠券，折扣券等类型Service接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface IActivityGradePrivilegeService extends IService<ActivityGradePrivilege> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityGradePrivilegeVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ActivityGradePrivilegeVo> queryList(ActivityGradePrivilegeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入等级积分特权类型：优惠券，折扣券等类型
+	 * @param bo 等级积分特权类型：优惠券，折扣券等类型新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ActivityGradePrivilegeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改等级积分特权类型：优惠券，折扣券等类型
+	 * @param bo 等级积分特权类型：优惠券，折扣券等类型编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ActivityGradePrivilegeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityGradeService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 等级积分Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 public interface IActivityGradeService extends IService<ActivityGrade> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 任务存储Service接口
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 public interface IActivityTaskService extends IService<ActivityTask> {

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskTimeService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.activity.service;
+
+import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
+import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
+import com.zhongzheng.modules.activity.bo.ActivityTaskTimeQueryBo;
+import com.zhongzheng.modules.activity.bo.ActivityTaskTimeAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityTaskTimeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 模拟考试分数给予积分关联Service接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface IActivityTaskTimeService extends IService<ActivityTaskTime> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ActivityTaskTimeVo queryById(Long taskId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ActivityTaskTimeVo> queryList(ActivityTaskTimeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入模拟考试分数给予积分关联
+	 * @param bo 模拟考试分数给予积分关联新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ActivityTaskTimeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改模拟考试分数给予积分关联
+	 * @param bo 模拟考试分数给予积分关联编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ActivityTaskTimeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityAdvertisingServiceImpl.java

@@ -48,7 +48,6 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityAdvertising::getRemarks, bo.getRemarks());
         lqw.eq(bo.getReStatus() != null, ActivityAdvertising::getReStatus, bo.getReStatus());
         lqw.eq(bo.getStatus() != null, ActivityAdvertising::getStatus, bo.getStatus());
-        lqw.eq(bo.getReleaseTime() != null, ActivityAdvertising::getReleaseTime, bo.getReleaseTime());
         lqw.like(StrUtil.isNotBlank(bo.getAdvName()), ActivityAdvertising::getAdvName, bo.getAdvName());
         return entity2Vo(this.list(lqw));
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationCourseServiceImpl.java

@@ -0,0 +1,94 @@
+package com.zhongzheng.modules.activity.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.activity.bo.ActivityConfigurationCourseAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseQueryBo;
+import com.zhongzheng.modules.activity.bo.ActivityConfigurationCourseEditBo;
+import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
+import com.zhongzheng.modules.activity.mapper.ActivityConfigurationCourseMapper;
+import com.zhongzheng.modules.activity.vo.ActivityConfigurationCourseVo;
+import com.zhongzheng.modules.activity.service.IActivityConfigurationCourseService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 活动配置关联课程包含范围Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+@Service
+public class ActivityConfigurationCourseServiceImpl extends ServiceImpl<ActivityConfigurationCourseMapper, ActivityConfigurationCourse> implements IActivityConfigurationCourseService {
+
+    @Override
+    public ActivityConfigurationCourseVo queryById(Long configurationId){
+        ActivityConfigurationCourse db = this.baseMapper.selectById(configurationId);
+        return BeanUtil.toBean(db, ActivityConfigurationCourseVo.class);
+    }
+
+    @Override
+    public List<ActivityConfigurationCourseVo> queryList(ActivityConfigurationCourseQueryBo bo) {
+        LambdaQueryWrapper<ActivityConfigurationCourse> lqw = Wrappers.lambdaQuery();
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityConfigurationCourseVo> entity2Vo(Collection<ActivityConfigurationCourse> collection) {
+        List<ActivityConfigurationCourseVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityConfigurationCourseVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityConfigurationCourse> page = (Page<ActivityConfigurationCourse>)collection;
+            Page<ActivityConfigurationCourseVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityConfigurationCourseAddBo bo) {
+        ActivityConfigurationCourse add = BeanUtil.toBean(bo, ActivityConfigurationCourse.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityConfigurationCourseEditBo bo) {
+        ActivityConfigurationCourse update = BeanUtil.toBean(bo, ActivityConfigurationCourse.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityConfigurationCourse 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/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -1,25 +1,27 @@
 package com.zhongzheng.modules.activity.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo;
 import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
+import com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse;
+import com.zhongzheng.modules.activity.mapper.ActivityConfigurationCourseMapper;
 import com.zhongzheng.modules.activity.mapper.ActivityConfigurationMapper;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
 import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
+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 org.springframework.transaction.annotation.Transactional;
 
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -31,29 +33,18 @@ import java.util.stream.Collectors;
 @Service
 public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfigurationMapper, ActivityConfiguration> implements IActivityConfigurationService {
 
+    @Autowired
+    private ActivityConfigurationCourseMapper activityConfigurationCourseMapper;
+
     @Override
     public ActivityConfigurationVo queryById(Long id){
-        ActivityConfiguration db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, ActivityConfigurationVo.class);
+        return this.baseMapper.selectConfigures(id);
+
     }
 
     @Override
     public List<ActivityConfigurationVo> queryList(ActivityConfigurationQueryBo bo) {
-        LambdaQueryWrapper<ActivityConfiguration> lqw = Wrappers.lambdaQuery();
-        lqw.like(StrUtil.isNotBlank(bo.getActivityName()), ActivityConfiguration::getActivityName, bo.getActivityName());
-        lqw.eq(StrUtil.isNotBlank(bo.getActivityType()), ActivityConfiguration::getActivityType, bo.getActivityType());
-        lqw.eq(StrUtil.isNotBlank(bo.getDescription()), ActivityConfiguration::getDescription, bo.getDescription());
-        lqw.eq(bo.getStartTime() != null, ActivityConfiguration::getStartTime, bo.getStartTime());
-        lqw.eq(bo.getEndTime() != null, ActivityConfiguration::getEndTime, bo.getEndTime());
-        lqw.eq(bo.getPrice() != null, ActivityConfiguration::getPrice, bo.getPrice());
-        lqw.eq(bo.getQuantity() != null, ActivityConfiguration::getQuantity, bo.getQuantity());
-        lqw.eq(bo.getValidityTime() != null, ActivityConfiguration::getValidityTime, bo.getValidityTime());
-        lqw.eq(StrUtil.isNotBlank(bo.getDiscount()), ActivityConfiguration::getDiscount, bo.getDiscount());
-        lqw.eq(StrUtil.isNotBlank(bo.getLiveContent()), ActivityConfiguration::getLiveContent, bo.getLiveContent());
-        lqw.eq(StrUtil.isNotBlank(bo.getLiveAdress()), ActivityConfiguration::getLiveAdress, bo.getLiveAdress());
-        lqw.eq(bo.getStatus() != null, ActivityConfiguration::getStatus, bo.getStatus());
-        lqw.ne(bo.getStatus() == null, ActivityConfiguration::getStatus, 0);
-        return entity2Vo(this.list(lqw));
+        return entity2Vo(baseMapper.selectConfiguraList(bo));
     }
 
     /**
@@ -62,12 +53,12 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     * @param collection 实体类集合
     * @return
     */
-    private List<ActivityConfigurationVo> entity2Vo(Collection<ActivityConfiguration> collection) {
+    private List<ActivityConfigurationVo> entity2Vo(Collection<ActivityConfigurationVo> collection) {
         List<ActivityConfigurationVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, ActivityConfigurationVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<ActivityConfiguration> page = (Page<ActivityConfiguration>)collection;
+            Page<ActivityConfigurationVo> page = (Page<ActivityConfigurationVo>)collection;
             Page<ActivityConfigurationVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
@@ -77,19 +68,42 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     }
 
     @Override
+    @Transactional
     public Boolean insertByAddBo(ActivityConfigurationAddBo bo) {
-        ActivityConfiguration add = BeanUtil.toBean(bo, ActivityConfiguration.class);
-        validEntityBeforeSave(add);
-        return this.save(add);
+        //新增活动
+        ActivityConfiguration activityConfiguration = BeanUtil.toBean(bo, ActivityConfiguration.class);
+        int insert = baseMapper.insert(activityConfiguration);
+        if (bo.getCoursesId() != null) {
+            //绑定课程
+            insertConfigCourse(activityConfiguration, bo.getCoursesId());
+        }
+        return true;
+    }
+
+    private void insertConfigCourse(ActivityConfiguration activityConfiguration, String[] coursesId) {
+        Arrays.stream(coursesId).forEach(e -> activityConfigurationCourseMapper.insert(new ActivityConfigurationCourse()
+                .setConfigurationId(activityConfiguration.getId()).setCourseId(Convert.toLong(e))));
     }
 
+
     @Override
     public Boolean updateByEditBo(ActivityConfigurationEditBo bo) {
         ActivityConfiguration update = BeanUtil.toBean(bo, ActivityConfiguration.class);
-        validEntityBeforeSave(update);
+        //修改绑定课程
+        if (bo.getCoursesId() != null){
+            updateConfigCourse(bo);
+        }
         return this.updateById(update);
     }
 
+    private void updateConfigCourse(ActivityConfigurationEditBo bo) {
+        activityConfigurationCourseMapper.deleteById(bo.getId());
+        Arrays.stream(bo.getCoursesId()).forEach(e ->{
+            activityConfigurationCourseMapper.insert(new ActivityConfigurationCourse()
+                    .setConfigurationId(bo.getId()).setCourseId(Convert.toLong(e)));
+        });
+    }
+
     /**
      * 保存前的数据校验
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityGradePrivilegeCouresServiceImpl.java

@@ -0,0 +1,94 @@
+package com.zhongzheng.modules.activity.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.activity.bo.ActivityGradePrivilegeCouresAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresQueryBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeCouresEditBo;
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures;
+import com.zhongzheng.modules.activity.mapper.ActivityGradePrivilegeCouresMapper;
+import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeCouresVo;
+import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeCouresService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 积分关联特权的范围课程Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Service
+public class ActivityGradePrivilegeCouresServiceImpl extends ServiceImpl<ActivityGradePrivilegeCouresMapper, ActivityGradePrivilegeCoures> implements IActivityGradePrivilegeCouresService {
+
+    @Override
+    public ActivityGradePrivilegeCouresVo queryById(Long privilegeId){
+        ActivityGradePrivilegeCoures db = this.baseMapper.selectById(privilegeId);
+        return BeanUtil.toBean(db, ActivityGradePrivilegeCouresVo.class);
+    }
+
+    @Override
+    public List<ActivityGradePrivilegeCouresVo> queryList(ActivityGradePrivilegeCouresQueryBo bo) {
+        LambdaQueryWrapper<ActivityGradePrivilegeCoures> lqw = Wrappers.lambdaQuery();
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityGradePrivilegeCouresVo> entity2Vo(Collection<ActivityGradePrivilegeCoures> collection) {
+        List<ActivityGradePrivilegeCouresVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityGradePrivilegeCouresVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityGradePrivilegeCoures> page = (Page<ActivityGradePrivilegeCoures>)collection;
+            Page<ActivityGradePrivilegeCouresVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityGradePrivilegeCouresAddBo bo) {
+        ActivityGradePrivilegeCoures add = BeanUtil.toBean(bo, ActivityGradePrivilegeCoures.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityGradePrivilegeCouresEditBo bo) {
+        ActivityGradePrivilegeCoures update = BeanUtil.toBean(bo, ActivityGradePrivilegeCoures.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityGradePrivilegeCoures 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/activity/service/impl/ActivityGradePrivilegeServiceImpl.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.activity.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.activity.bo.ActivityGradePrivilegeAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeQueryBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeEditBo;
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
+import com.zhongzheng.modules.activity.mapper.ActivityGradePrivilegeMapper;
+import com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo;
+import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 等级积分特权类型：优惠券，折扣券等类型Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Service
+public class ActivityGradePrivilegeServiceImpl extends ServiceImpl<ActivityGradePrivilegeMapper, ActivityGradePrivilege> implements IActivityGradePrivilegeService {
+
+    @Override
+    public ActivityGradePrivilegeVo queryById(Long id){
+        ActivityGradePrivilege db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ActivityGradePrivilegeVo.class);
+    }
+
+    @Override
+    public List<ActivityGradePrivilegeVo> queryList(ActivityGradePrivilegeQueryBo bo) {
+        LambdaQueryWrapper<ActivityGradePrivilege> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getGradeId() != null, ActivityGradePrivilege::getGradeId, bo.getGradeId());
+        lqw.eq(StrUtil.isNotBlank(bo.getPriType()), ActivityGradePrivilege::getPriType, bo.getPriType());
+        lqw.eq(bo.getCouponPrice() != null, ActivityGradePrivilege::getCouponPrice, bo.getCouponPrice());
+        lqw.eq(bo.getDiscount() != null, ActivityGradePrivilege::getDiscount, bo.getDiscount());
+        lqw.eq(bo.getEndTimeSum() != null, ActivityGradePrivilege::getEndTimeSum, bo.getEndTimeSum());
+        lqw.eq(bo.getQuantity() != null, ActivityGradePrivilege::getQuantity, bo.getQuantity());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityGradePrivilegeVo> entity2Vo(Collection<ActivityGradePrivilege> collection) {
+        List<ActivityGradePrivilegeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityGradePrivilegeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityGradePrivilege> page = (Page<ActivityGradePrivilege>)collection;
+            Page<ActivityGradePrivilegeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityGradePrivilegeAddBo bo) {
+        ActivityGradePrivilege add = BeanUtil.toBean(bo, ActivityGradePrivilege.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityGradePrivilegeEditBo bo) {
+        ActivityGradePrivilege update = BeanUtil.toBean(bo, ActivityGradePrivilege.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityGradePrivilege 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/activity/service/impl/ActivityGradeServiceImpl.java

@@ -1,41 +1,63 @@
 package com.zhongzheng.modules.activity.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.modules.activity.bo.ActivityGradeAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradePrivilegeEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityGradeQueryBo;
 import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
 import com.zhongzheng.modules.activity.domain.ActivityGrade;
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures;
 import com.zhongzheng.modules.activity.mapper.ActivityGradeMapper;
+import com.zhongzheng.modules.activity.mapper.ActivityGradePrivilegeCouresMapper;
+import com.zhongzheng.modules.activity.mapper.ActivityGradePrivilegeMapper;
+import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeCouresService;
+import com.zhongzheng.modules.activity.service.IActivityGradePrivilegeService;
 import com.zhongzheng.modules.activity.service.IActivityGradeService;
 import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
+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 org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
  * 等级积分Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Service
 public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, ActivityGrade> implements IActivityGradeService {
 
+    @Autowired
+    private ActivityGradePrivilegeCouresMapper activityGradePrivilegeCouresMapper;
+
+    @Autowired
+    private IActivityGradePrivilegeService activityGradePrivilegeService;
+
+    @Autowired
+    private IActivityGradePrivilegeCouresService activityGradePrivilegeCouresService;
+
+    @Autowired
+    private ActivityGradePrivilegeMapper activityGradePrivilegeMapper;
+
     @Override
     public ActivityGradeVo queryById(Long id){
         ActivityGrade db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, ActivityGradeVo.class);
+        ActivityGradeVo activityGradeVo = BeanUtil.toBean(db, ActivityGradeVo.class);
+        activityGradeVo.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(activityGradeVo.getId()));
+        return activityGradeVo;
     }
 
     @Override
@@ -46,7 +68,15 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
         lqw.eq(bo.getNeedIntegralStart() != null, ActivityGrade::getNeedIntegralStart, bo.getNeedIntegralStart());
         lqw.eq(bo.getNeedIntegralEnd() != null, ActivityGrade::getNeedIntegralEnd, bo.getNeedIntegralEnd());
         lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityGrade::getRemarks, bo.getRemarks());
-        return entity2Vo(this.list(lqw));
+        List<ActivityGradeVo> activityGradeVos = selectGradeCourse(this.list(lqw));
+        return entity2Vo(activityGradeVos);
+    }
+
+    private List<ActivityGradeVo> selectGradeCourse(List<ActivityGrade> list) {
+        List<ActivityGradeVo> activityGradeVos =new ArrayList<>();
+                BeanUtil.copyProperties(list,activityGradeVos);
+        activityGradeVos.stream().forEach(a -> a.setActivityGradePrivilegesVo(activityGradePrivilegeMapper.selectGradePriList(a.getId())));
+        return activityGradeVos;
     }
 
     /**
@@ -55,12 +85,12 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     * @param collection 实体类集合
     * @return
     */
-    private List<ActivityGradeVo> entity2Vo(Collection<ActivityGrade> collection) {
+    private List<ActivityGradeVo> entity2Vo(Collection<ActivityGradeVo> collection) {
         List<ActivityGradeVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, ActivityGradeVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<ActivityGrade> page = (Page<ActivityGrade>)collection;
+            Page<ActivityGradeVo> page = (Page<ActivityGradeVo>)collection;
             Page<ActivityGradeVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
@@ -73,16 +103,58 @@ public class ActivityGradeServiceImpl extends ServiceImpl<ActivityGradeMapper, A
     public Boolean insertByAddBo(ActivityGradeAddBo bo) {
         ActivityGrade add = BeanUtil.toBean(bo, ActivityGrade.class);
         validEntityBeforeSave(add);
+        //添加特权类型
+        if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeAddBos())) {
+            bo.getActivityGradePrivilegeAddBos().stream().forEach(p ->{
+                ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
+                activityGradePrivilegeService.save(activityGradePrivilege);
+                Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresService
+                        .save(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
+                                .setCourseId(Convert.toLong(c))));
+            });
+        }
+        //添加特权绑定的
         return this.save(add);
     }
 
     @Override
+    @Transactional
     public Boolean updateByEditBo(ActivityGradeEditBo bo) {
         ActivityGrade update = BeanUtil.toBean(bo, ActivityGrade.class);
         validEntityBeforeSave(update);
+        //修改特权类型
+        if (!CollectionUtils.isEmpty(bo.getActivityGradePrivilegeEditBos())) {
+            updateGradePrivilege(bo.getActivityGradePrivilegeEditBos());
+        }
         return this.updateById(update);
     }
 
+    private void updateGradePrivilege(List<ActivityGradePrivilegeEditBo> activityGradePrivilegeEditBos) {
+        activityGradePrivilegeEditBos.stream().forEach(p ->{
+                //修改未删除
+                if (p.getId() != null && p.getStatus() == 1) {
+                    ActivityGradePrivilegeEditBo activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilegeEditBo.class);
+                    activityGradePrivilegeService.updateByEditBo(activityGradePrivilege);
+                    activityGradePrivilegeCouresService.removeById(activityGradePrivilege.getId());
+                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresService
+                            .save(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
+                                    .setCourseId(Convert.toLong(c))));
+                  //  增加
+                }else if(p.getId() == null){
+                    ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
+                    activityGradePrivilegeService.save(activityGradePrivilege);
+                    Arrays.stream(p.getCourseIds()).forEach(c -> activityGradePrivilegeCouresService
+                            .save(new ActivityGradePrivilegeCoures().setPrivilegeId(activityGradePrivilege.getId())
+                                    .setCourseId(Convert.toLong(c))));
+                    //删除
+                }else {
+                    ActivityGradePrivilege activityGradePrivilege = BeanUtil.toBean(p, ActivityGradePrivilege.class);
+                    activityGradePrivilegeService.removeById(activityGradePrivilege.getId());
+                }
+
+            });
+    }
+
     /**
      * 保存前的数据校验
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskServiceImpl.java

@@ -2,6 +2,10 @@ package com.zhongzheng.modules.activity.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
+import com.zhongzheng.modules.activity.service.IActivityTaskTimeService;
+import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
+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;
@@ -15,6 +19,7 @@ import com.zhongzheng.modules.activity.mapper.ActivityTaskMapper;
 import com.zhongzheng.modules.activity.vo.ActivityTaskVo;
 import com.zhongzheng.modules.activity.service.IActivityTaskService;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -23,16 +28,27 @@ import java.util.stream.Collectors;
 /**
  * 任务存储Service业务层处理
  *
- * @author ruoyi
+ * @author change
  * @date 2021-05-19
  */
 @Service
 public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, ActivityTask> implements IActivityTaskService {
 
+    @Autowired
+    private IActivityTaskTimeService activityTaskTimeService;
+
     @Override
     public ActivityTaskVo queryById(Long id){
         ActivityTask db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, ActivityTaskVo.class);
+        ActivityTaskVo activityTaskVo = BeanUtil.toBean(db, ActivityTaskVo.class);
+        if (activityTaskVo.getId() != null && activityTaskVo.getTaskType() == 5) {
+            LambdaQueryWrapper<ActivityTaskTime> lqwTime = Wrappers.lambdaQuery();
+            lqwTime.eq(db.getId() != null,ActivityTaskTime::getTaskId,db.getId());
+            List<ActivityTaskTimeVo> activityTaskTimeVo = new ArrayList<>();
+            BeanUtil.copyProperties(activityTaskTimeService.list(lqwTime),activityTaskTimeVo);
+            activityTaskVo.setActivityTaskTimeVo(activityTaskTimeVo);
+        }
+        return activityTaskVo;
     }
 
     @Override
@@ -47,7 +63,18 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
         lqw.eq(bo.getLongTime() != null, ActivityTask::getLongTime, bo.getLongTime());
         lqw.eq(bo.getCountDay() != null, ActivityTask::getCountDay, bo.getCountDay());
         lqw.eq(bo.getStatus() != null, ActivityTask::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
+        List<ActivityTaskVo> list = new ArrayList<>();
+        BeanUtil.copyProperties(this.list(lqw),list);
+        list.stream().forEach(l -> {
+            if (l.getId() != null && l.getTaskType() == 5) {
+                LambdaQueryWrapper<ActivityTaskTime> lqwTime = Wrappers.lambdaQuery();
+                lqwTime.eq(l.getId() != null,ActivityTaskTime::getTaskId,l.getId());
+                List<ActivityTaskTimeVo> activityTaskTimeVo = new ArrayList<>();
+                BeanUtil.copyProperties(activityTaskTimeService.list(lqwTime),activityTaskTimeVo);
+                l.setActivityTaskTimeVo(activityTaskTimeVo);
+            }
+        });
+        return entity2Vo(list);
     }
 
     /**
@@ -56,12 +83,12 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     * @param collection 实体类集合
     * @return
     */
-    private List<ActivityTaskVo> entity2Vo(Collection<ActivityTask> collection) {
+    private List<ActivityTaskVo> entity2Vo(Collection<ActivityTaskVo> collection) {
         List<ActivityTaskVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, ActivityTaskVo.class))
                 .collect(Collectors.toList());
         if (collection instanceof Page) {
-            Page<ActivityTask> page = (Page<ActivityTask>)collection;
+            Page<ActivityTaskVo> page = (Page<ActivityTaskVo>)collection;
             Page<ActivityTaskVo> pageVo = new Page<>();
             BeanUtil.copyProperties(page,pageVo);
             pageVo.addAll(voList);
@@ -74,6 +101,9 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     public Boolean insertByAddBo(ActivityTaskAddBo bo) {
         ActivityTask add = BeanUtil.toBean(bo, ActivityTask.class);
         validEntityBeforeSave(add);
+        if (bo.getTaskType() != null && bo.getTaskType() == 5){
+            bo.getActivityTaskTimeAddBo().stream().forEach(t -> activityTaskTimeService.save(BeanUtil.toBean(t,ActivityTaskTime.class)));
+        }
         return this.save(add);
     }
 
@@ -81,6 +111,10 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
     public Boolean updateByEditBo(ActivityTaskEditBo bo) {
         ActivityTask update = BeanUtil.toBean(bo, ActivityTask.class);
         validEntityBeforeSave(update);
+        if (bo.getTaskType() != null && bo.getTaskType() == 5){
+            activityTaskTimeService.removeById(bo.getId());
+            bo.getActivityTaskTimeEditBoList().stream().forEach(t -> activityTaskTimeService.save(BeanUtil.toBean(t,ActivityTaskTime.class)));
+        }
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskTimeServiceImpl.java

@@ -0,0 +1,97 @@
+package com.zhongzheng.modules.activity.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.activity.bo.ActivityTaskTimeAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityTaskTimeQueryBo;
+import com.zhongzheng.modules.activity.bo.ActivityTaskTimeEditBo;
+import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
+import com.zhongzheng.modules.activity.mapper.ActivityTaskTimeMapper;
+import com.zhongzheng.modules.activity.vo.ActivityTaskTimeVo;
+import com.zhongzheng.modules.activity.service.IActivityTaskTimeService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 模拟考试分数给予积分关联Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Service
+public class ActivityTaskTimeServiceImpl extends ServiceImpl<ActivityTaskTimeMapper, ActivityTaskTime> implements IActivityTaskTimeService {
+
+    @Override
+    public ActivityTaskTimeVo queryById(Long taskId){
+        ActivityTaskTime db = this.baseMapper.selectById(taskId);
+        return BeanUtil.toBean(db, ActivityTaskTimeVo.class);
+    }
+
+    @Override
+    public List<ActivityTaskTimeVo> queryList(ActivityTaskTimeQueryBo bo) {
+        LambdaQueryWrapper<ActivityTaskTime> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStartRange() != null, ActivityTaskTime::getStartRange, bo.getStartRange());
+        lqw.eq(bo.getEndRange() != null, ActivityTaskTime::getEndRange, bo.getEndRange());
+        lqw.eq(bo.getIntegral() != null, ActivityTaskTime::getIntegral, bo.getIntegral());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ActivityTaskTimeVo> entity2Vo(Collection<ActivityTaskTime> collection) {
+        List<ActivityTaskTimeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ActivityTaskTimeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ActivityTaskTime> page = (Page<ActivityTaskTime>)collection;
+            Page<ActivityTaskTimeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ActivityTaskTimeAddBo bo) {
+        ActivityTaskTime add = BeanUtil.toBean(bo, ActivityTaskTime.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ActivityTaskTimeEditBo bo) {
+        ActivityTaskTime update = BeanUtil.toBean(bo, ActivityTaskTime.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ActivityTaskTime 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/activity/vo/ActivityConfigurationCourseVo.java

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.activity.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 change
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("活动配置关联课程包含范围视图对象")
+public class ActivityConfigurationCourseVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 活动配置id */
+	@ApiModelProperty("活动配置id")
+	private Long configurationId;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityConfigurationVo.java

@@ -1,12 +1,16 @@
 package com.zhongzheng.modules.activity.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.course.domain.Course;
+import com.zhongzheng.modules.course.vo.CourseVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -73,4 +77,19 @@ public class ActivityConfigurationVo {
 	@ApiModelProperty("0删除 1结束 2 撤回 3开始 4未开始")
 	private Integer status;
 
+	/** 创建时间 */
+	@Excel(name = "创建时间")
+	@ApiModelProperty("创建时间")
+	private Long createTime;
+
+	/** 修改时间 */
+	@Excel(name = "修改时间")
+	@ApiModelProperty("修改时间")
+	private Long updateTime;
+
+	/** 绑定课程 */
+	@Excel(name = "绑定课程")
+	@ApiModelProperty("绑定课程")
+	private List<CourseVo> courses;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGradePrivilegeCouresVo.java

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.activity.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 change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("积分关联特权的范围课程视图对象")
+public class ActivityGradePrivilegeCouresVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 活动配置id */
+	@ApiModelProperty("活动配置id")
+	private Long privilegeId;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGradePrivilegeVo.java

@@ -0,0 +1,62 @@
+package com.zhongzheng.modules.activity.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
+import com.zhongzheng.modules.course.vo.CourseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 等级积分特权类型：优惠券，折扣券等类型视图对象 mall_package
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("等级积分特权类型：优惠券，折扣券等类型视图对象")
+public class ActivityGradePrivilegeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 关联积分表id */
+	@Excel(name = "关联积分表id")
+	@ApiModelProperty("关联积分表id")
+	private Long gradeId;
+	/** 特权类型 */
+	@Excel(name = "特权类型")
+	@ApiModelProperty("特权类型")
+	private String priType;
+	/** 优惠券金额 */
+	@Excel(name = "优惠券金额")
+	@ApiModelProperty("优惠券金额")
+	private Long couponPrice;
+	/** 折扣 */
+	@Excel(name = "折扣")
+	@ApiModelProperty("折扣")
+	private Integer discount;
+	/** 有效期几个月 */
+	@Excel(name = "有效期几个月")
+	@ApiModelProperty("有效期几个月")
+	private Integer endTimeSum;
+	/** 发放数量 */
+	@Excel(name = "发放数量")
+	@ApiModelProperty("发放数量")
+	private Integer quantity;
+
+	@Excel(name = "关联优惠课程")
+	@ApiModelProperty("关联优惠课程")
+	private List<CourseVo> courseVo;
+
+	/** 0删除 1使用 */
+	@ApiModelProperty("0删除 1使用")
+	private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityGradeVo.java

@@ -1,18 +1,21 @@
 package com.zhongzheng.modules.activity.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.activity.domain.ActivityGradePrivilege;
 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
+ * @author change
  * @date 2021-05-19
  */
 @Data
@@ -45,4 +48,16 @@ public class ActivityGradeVo {
 	@ApiModelProperty("说明备注")
 	private String remarks;
 
+	/** 创建时间 */
+	@TableField(fill = FieldFill.INSERT)
+	private Long createTime;
+
+	/** 修改时间 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Long updateTime;
+
+	@Excel(name = "关联特权类型")
+	@ApiModelProperty("关联特权类型")
+	private List<ActivityGradePrivilegeVo> activityGradePrivilegesVo;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityTaskTimeVo.java

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.activity.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 change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("模拟考试分数给予积分关联视图对象")
+public class ActivityTaskTimeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 任务ID */
+	@ApiModelProperty("任务ID")
+	private Long taskId;
+
+	/** 分数最低范围 */
+	@Excel(name = "分数最低范围")
+	@ApiModelProperty("分数最低范围")
+	private Integer startRange;
+	/** 分数最高范围 */
+	@Excel(name = "分数最高范围")
+	@ApiModelProperty("分数最高范围")
+	private Integer endRange;
+	/** 奖励积分 */
+	@Excel(name = "奖励积分")
+	@ApiModelProperty("奖励积分")
+	private Integer integral;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityTaskVo.java

@@ -2,17 +2,18 @@ package com.zhongzheng.modules.activity.vo;
 
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhongzheng.modules.activity.domain.ActivityTaskTime;
 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
+ * @author change
  * @date 2021-05-19
  */
 @Data
@@ -25,8 +26,10 @@ public class ActivityTaskVo {
 	private Long id;
 
 	/** 任务名称 */
-	@Excel(name = "任务名称")
-	@ApiModelProperty("任务名称")
+	@Excel(name = "任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
+			"4视频学习 5模拟考试")
+	@ApiModelProperty("任务名称  0每日签到 1完善信息 2邀请好友 3每日分享\n" +
+			"4视频学习 5模拟考试")
 	private Integer taskType;
 	/** 奖励积分 */
 	@Excel(name = "奖励积分")
@@ -61,4 +64,9 @@ public class ActivityTaskVo {
 	@ApiModelProperty("0 停用 1启用")
 	private Integer status;
 
+	/** 分数范围 适用与考试积分获得 */
+	@Excel(name = "分数范围 适用与考试积分获得")
+	@ApiModelProperty("分数范围 适用与考试积分获得")
+	private List<ActivityTaskTimeVo> activityTaskTimeVo;
+
 }

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

@@ -0,0 +1,90 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 考试安排，包含考试指引添加对象 exam_arrangement
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("考试安排，包含考试指引添加对象")
+public class ExamArrangementAddBo {
+
+    /** 考试类型id */
+    @ApiModelProperty("考试类型id")
+    private Long examTypeId;
+    /** 考试类型 */
+    @ApiModelProperty("考试类型")
+    private String examType;
+    /** 报名开始时间 */
+    @ApiModelProperty("报名开始时间")
+    private Long signStartTime;
+    /** 报名结束时间 */
+    @ApiModelProperty("报名结束时间")
+    private Long signEndTime;
+    /** 考试地点 */
+    @ApiModelProperty("考试地点")
+    private String examAdress;
+    /** 报名网址 */
+    @ApiModelProperty("报名网址")
+    private String examUrl;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remarks;
+    /** 0手动发布  3定时发布 4已结束 */
+    @ApiModelProperty("0手动发布  3定时发布 4已结束")
+    private Integer release;
+    /** 订阅人数 */
+    @ApiModelProperty("订阅人数")
+    private Integer subscrPe;
+    /** 报名人数 */
+    @ApiModelProperty("报名人数")
+    private Integer signUpPe;
+    /** 定时发布的时间 */
+    @ApiModelProperty("定时发布的时间")
+    private Long releaseTime;
+    /** 更改时间 */
+    @ApiModelProperty("更改时间")
+    private Long updateTime;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 发布时间 */
+    @ApiModelProperty("发布时间")
+    private Long examTime;
+    /** 报名考试指引 */
+    @ApiModelProperty("报名考试指引")
+    private String regGuide;
+    /** 考试期次 */
+    @ApiModelProperty("考试期次")
+    private String examPeriod;
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+    private Integer status;
+    /** 0 笔试  1机考 */
+    @ApiModelProperty("0 笔试  1机考")
+    private Integer examForm;
+    /** 考试通知网址 */
+    @ApiModelProperty("考试通知网址")
+    private String examFromUrl;
+    /** 打印网址 */
+    @ApiModelProperty("打印网址")
+    private String printUrl;
+    /** 成绩查询 */
+    @ApiModelProperty("成绩查询")
+    private String gradesUrl;
+    /** 分数线查询 */
+    @ApiModelProperty("分数线查询")
+    private String scoreLineUrl;
+    /** 申领证书 */
+    @ApiModelProperty("申领证书")
+    private String certificate;
+}

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

@@ -0,0 +1,112 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 考试安排，包含考试指引编辑对象 exam_arrangement
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("考试安排，包含考试指引编辑对象")
+public class ExamArrangementEditBo {
+
+
+    /** 主键 */
+    @ApiModelProperty("主键")
+    private Long id;
+
+    /** 考试类型id */
+    @ApiModelProperty("考试类型id")
+    private Long examTypeId;
+
+    /** 考试类型 */
+    @ApiModelProperty("考试类型")
+    private String examType;
+
+    /** 报名开始时间 */
+    @ApiModelProperty("报名开始时间")
+    private Long signStartTime;
+
+    /** 报名结束时间 */
+    @ApiModelProperty("报名结束时间")
+    private Long signEndTime;
+
+    /** 考试地点 */
+    @ApiModelProperty("考试地点")
+    private String examAdress;
+
+    /** 报名网址 */
+    @ApiModelProperty("报名网址")
+    private String examUrl;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /** 0手动发布  3定时发布 4已结束 */
+    @ApiModelProperty("0手动发布  3定时发布 4已结束")
+    private Integer release;
+
+    /** 订阅人数 */
+    @ApiModelProperty("订阅人数")
+    private Integer subscrPe;
+
+    /** 报名人数 */
+    @ApiModelProperty("报名人数")
+    private Integer signUpPe;
+
+    /** 定时发布的时间 */
+    @ApiModelProperty("定时发布的时间")
+    private Long releaseTime;
+
+    /** 更改时间 */
+    @ApiModelProperty("更改时间")
+    private Long updateTime;
+
+    /** 发布时间 */
+    @ApiModelProperty("发布时间")
+    private Long examTime;
+
+    /** 报名考试指引 */
+    @ApiModelProperty("报名考试指引")
+    private String regGuide;
+
+    /** 考试期次 */
+    @ApiModelProperty("考试期次")
+    private String examPeriod;
+
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    @ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+    private Integer status;
+
+    /** 0 笔试  1机考 */
+    @ApiModelProperty("0 笔试  1机考")
+    private Integer examForm;
+
+    /** 考试通知网址 */
+    @ApiModelProperty("考试通知网址")
+    private String examFromUrl;
+
+    /** 打印网址 */
+    @ApiModelProperty("打印网址")
+    private String printUrl;
+
+    /** 成绩查询 */
+    @ApiModelProperty("成绩查询")
+    private String gradesUrl;
+
+    /** 分数线查询 */
+    @ApiModelProperty("分数线查询")
+    private String scoreLineUrl;
+
+    /** 申领证书 */
+    @ApiModelProperty("申领证书")
+    private String certificate;
+}

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

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 考试安排，包含考试指引分页查询对象 exam_arrangement
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试安排，包含考试指引分页查询对象")
+public class ExamArrangementQueryBo 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 examTypeId;
+	/** 考试类型 */
+	@ApiModelProperty("考试类型")
+	private String examType;
+	/** 报名开始时间 */
+	@ApiModelProperty("报名开始时间")
+	private Long signStartTime;
+	/** 报名结束时间 */
+	@ApiModelProperty("报名结束时间")
+	private Long signEndTime;
+	/** 考试地点 */
+	@ApiModelProperty("考试地点")
+	private String examAdress;
+	/** 报名网址 */
+	@ApiModelProperty("报名网址")
+	private String examUrl;
+	/** 备注 */
+	@ApiModelProperty("备注")
+	private String remarks;
+	/** 0手动发布  3定时发布 4已结束 */
+	@ApiModelProperty("0手动发布  3定时发布 4已结束")
+	private Integer release;
+	/** 订阅人数 */
+	@ApiModelProperty("订阅人数")
+	private Integer subscrPe;
+	/** 报名人数 */
+	@ApiModelProperty("报名人数")
+	private Integer signUpPe;
+	/** 定时发布的时间 */
+	@ApiModelProperty("定时发布的时间")
+	private Long releaseTime;
+	/** 发布时间 */
+	@ApiModelProperty("发布时间")
+	private Long examTime;
+	/** 报名考试指引 */
+	@ApiModelProperty("报名考试指引")
+	private String regGuide;
+	/** 考试期次 */
+	@ApiModelProperty("考试期次")
+	private String examPeriod;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private Integer status;
+	/** 0 笔试  1机考 */
+	@ApiModelProperty("0 笔试  1机考")
+	private Integer examForm;
+	/** 考试通知网址 */
+	@ApiModelProperty("考试通知网址")
+	private String examFromUrl;
+	/** 打印网址 */
+	@ApiModelProperty("打印网址")
+	private String printUrl;
+	/** 成绩查询 */
+	@ApiModelProperty("成绩查询")
+	private String gradesUrl;
+	/** 分数线查询 */
+	@ApiModelProperty("分数线查询")
+	private String scoreLineUrl;
+	/** 申领证书 */
+	@ApiModelProperty("申领证书")
+	private String certificate;
+
+}

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

@@ -0,0 +1,21 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 报名考试得学生关联添加对象 exam_arrangement_student
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("报名考试得学生关联添加对象")
+public class ExamArrangementStudentAddBo {
+
+}

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

@@ -0,0 +1,28 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 报名考试得学生关联编辑对象 exam_arrangement_student
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("报名考试得学生关联编辑对象")
+public class ExamArrangementStudentEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long arrangementId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long studentId;
+}

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

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 报名考试得学生关联分页查询对象 exam_arrangement_student
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("报名考试得学生关联分页查询对象")
+public class ExamArrangementStudentQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+
+}

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

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 考试时间段安排添加对象 exam_arrangement_time
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("考试时间段安排添加对象")
+public class ExamArrangementTimeAddBo {
+
+    /** 考试开始时间 */
+    @ApiModelProperty("考试开始时间")
+    private Long startTime;
+    /** 考试结束时间 */
+    @ApiModelProperty("考试结束时间")
+    private Long endTime;
+}

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

@@ -0,0 +1,32 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 考试时间段安排编辑对象 exam_arrangement_time
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("考试时间段安排编辑对象")
+public class ExamArrangementTimeEditBo {
+
+
+    /** exam_arrangement关联表id */
+    @ApiModelProperty("exam_arrangement关联表id")
+    private Long arrangementId;
+
+    /** 考试开始时间 */
+    @ApiModelProperty("考试开始时间")
+    private Long startTime;
+
+    /** 考试结束时间 */
+    @ApiModelProperty("考试结束时间")
+    private Long endTime;
+}

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

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.exam.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 考试时间段安排分页查询对象 exam_arrangement_time
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("考试时间段安排分页查询对象")
+public class ExamArrangementTimeQueryBo 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 startTime;
+	/** 考试结束时间 */
+	@ApiModelProperty("考试结束时间")
+	private Long endTime;
+
+}

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

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.exam.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 考试安排，包含考试指引对象 exam_arrangement
+ * 
+ * @author change
+ * @date 2021-05-19
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_arrangement")
+public class ExamArrangement implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 主键 */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 考试类型id */
+    private Long examTypeId;
+
+    /** 考试类型 */
+    private String examType;
+
+    /** 报名开始时间 */
+    private Long signStartTime;
+
+    /** 报名结束时间 */
+    private Long signEndTime;
+
+    /** 考试地点 */
+    private String examAdress;
+
+    /** 报名网址 */
+    private String examUrl;
+
+    /** 备注 */
+    private String remarks;
+
+    /** 0手动发布  3定时发布 4已结束 */
+    private Integer release;
+
+    /** 订阅人数 */
+    private Integer subscrPe;
+
+    /** 报名人数 */
+    private Integer signUpPe;
+
+    /** 定时发布的时间 */
+    private Long releaseTime;
+
+    /** 更改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 发布时间 */
+    private Long examTime;
+
+    /** 报名考试指引 */
+    private String regGuide;
+
+    /** 考试期次 */
+    private String examPeriod;
+
+    /** 0删除 1待发布 2 撤回 3发布成功 */
+    private Integer status;
+
+    /** 0 笔试  1机考 */
+    private Integer examForm;
+
+    /** 考试通知网址 */
+    private String examFromUrl;
+
+    /** 打印网址 */
+    private String printUrl;
+
+    /** 成绩查询 */
+    private String gradesUrl;
+
+    /** 分数线查询 */
+    private String scoreLineUrl;
+
+    /** 申领证书 */
+    private String certificate;
+
+}

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

@@ -0,0 +1,34 @@
+package com.zhongzheng.modules.exam.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 报名考试得学生关联对象 exam_arrangement_student
+ * 
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_arrangement_student")
+public class ExamArrangementStudent implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "arrangement_id")
+    private Long arrangementId;
+
+    /** $column.columnComment */
+    private Long studentId;
+
+}

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

@@ -0,0 +1,37 @@
+package com.zhongzheng.modules.exam.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 考试时间段安排对象 exam_arrangement_time
+ * 
+ * @author change
+ * @date 2021-05-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("exam_arrangement_time")
+public class ExamArrangementTime implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** exam_arrangement关联表id */
+    @TableId(value = "arrangement_id")
+    private Long arrangementId;
+
+    /** 考试开始时间 */
+    private Long startTime;
+
+    /** 考试结束时间 */
+    private Long endTime;
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamArrangement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 考试安排，包含考试指引Mapper接口
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+public interface ExamArrangementMapper extends BaseMapper<ExamArrangement> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamArrangementStudent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 报名考试得学生关联Mapper接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface ExamArrangementStudentMapper extends BaseMapper<ExamArrangementStudent> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.exam.mapper;
+
+import com.zhongzheng.modules.exam.domain.ExamArrangementTime;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 考试时间段安排Mapper接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface ExamArrangementTimeMapper extends BaseMapper<ExamArrangementTime> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamArrangement;
+import com.zhongzheng.modules.exam.vo.ExamArrangementVo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试安排，包含考试指引Service接口
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+public interface IExamArrangementService extends IService<ExamArrangement> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamArrangementVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamArrangementVo> queryList(ExamArrangementQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试安排，包含考试指引
+	 * @param bo 考试安排，包含考试指引新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamArrangementAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试安排，包含考试指引
+	 * @param bo 考试安排，包含考试指引编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamArrangementEditBo 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/IExamArrangementStudentService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamArrangementStudent;
+import com.zhongzheng.modules.exam.vo.ExamArrangementStudentVo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementStudentQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementStudentAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementStudentEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 报名考试得学生关联Service接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface IExamArrangementStudentService extends IService<ExamArrangementStudent> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamArrangementStudentVo queryById(Long arrangementId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamArrangementStudentVo> queryList(ExamArrangementStudentQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入报名考试得学生关联
+	 * @param bo 报名考试得学生关联新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamArrangementStudentAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改报名考试得学生关联
+	 * @param bo 报名考试得学生关联编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamArrangementStudentEditBo 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/IExamArrangementTimeService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.exam.service;
+
+import com.zhongzheng.modules.exam.domain.ExamArrangementTime;
+import com.zhongzheng.modules.exam.vo.ExamArrangementTimeVo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementTimeQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementTimeAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementTimeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 考试时间段安排Service接口
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+public interface IExamArrangementTimeService extends IService<ExamArrangementTime> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ExamArrangementTimeVo queryById(Long arrangementId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ExamArrangementTimeVo> queryList(ExamArrangementTimeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入考试时间段安排
+	 * @param bo 考试时间段安排新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ExamArrangementTimeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改考试时间段安排
+	 * @param bo 考试时间段安排编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ExamArrangementTimeEditBo 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/ExamArrangementServiceImpl.java

@@ -0,0 +1,115 @@
+package com.zhongzheng.modules.exam.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.ExamArrangementAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementEditBo;
+import com.zhongzheng.modules.exam.domain.ExamArrangement;
+import com.zhongzheng.modules.exam.mapper.ExamArrangementMapper;
+import com.zhongzheng.modules.exam.vo.ExamArrangementVo;
+import com.zhongzheng.modules.exam.service.IExamArrangementService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试安排，包含考试指引Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-19
+ */
+@Service
+public class ExamArrangementServiceImpl extends ServiceImpl<ExamArrangementMapper, ExamArrangement> implements IExamArrangementService {
+
+    @Override
+    public ExamArrangementVo queryById(Long id){
+        ExamArrangement db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ExamArrangementVo.class);
+    }
+
+    @Override
+    public List<ExamArrangementVo> queryList(ExamArrangementQueryBo bo) {
+        LambdaQueryWrapper<ExamArrangement> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getExamTypeId() != null, ExamArrangement::getExamTypeId, bo.getExamTypeId());
+        lqw.eq(StrUtil.isNotBlank(bo.getExamType()), ExamArrangement::getExamType, bo.getExamType());
+        lqw.eq(bo.getSignStartTime() != null, ExamArrangement::getSignStartTime, bo.getSignStartTime());
+        lqw.eq(bo.getSignEndTime() != null, ExamArrangement::getSignEndTime, bo.getSignEndTime());
+        lqw.eq(StrUtil.isNotBlank(bo.getExamAdress()), ExamArrangement::getExamAdress, bo.getExamAdress());
+        lqw.eq(StrUtil.isNotBlank(bo.getExamUrl()), ExamArrangement::getExamUrl, bo.getExamUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ExamArrangement::getRemarks, bo.getRemarks());
+        lqw.eq(bo.getRelease() != null, ExamArrangement::getRelease, bo.getRelease());
+        lqw.eq(bo.getSubscrPe() != null, ExamArrangement::getSubscrPe, bo.getSubscrPe());
+        lqw.eq(bo.getSignUpPe() != null, ExamArrangement::getSignUpPe, bo.getSignUpPe());
+        lqw.eq(bo.getReleaseTime() != null, ExamArrangement::getReleaseTime, bo.getReleaseTime());
+        lqw.eq(bo.getExamTime() != null, ExamArrangement::getExamTime, bo.getExamTime());
+        lqw.eq(StrUtil.isNotBlank(bo.getRegGuide()), ExamArrangement::getRegGuide, bo.getRegGuide());
+        lqw.eq(StrUtil.isNotBlank(bo.getExamPeriod()), ExamArrangement::getExamPeriod, bo.getExamPeriod());
+        lqw.eq(bo.getStatus() != null, ExamArrangement::getStatus, bo.getStatus());
+        lqw.eq(bo.getExamForm() != null, ExamArrangement::getExamForm, bo.getExamForm());
+        lqw.eq(StrUtil.isNotBlank(bo.getExamFromUrl()), ExamArrangement::getExamFromUrl, bo.getExamFromUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getPrintUrl()), ExamArrangement::getPrintUrl, bo.getPrintUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getGradesUrl()), ExamArrangement::getGradesUrl, bo.getGradesUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getScoreLineUrl()), ExamArrangement::getScoreLineUrl, bo.getScoreLineUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getCertificate()), ExamArrangement::getCertificate, bo.getCertificate());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamArrangementVo> entity2Vo(Collection<ExamArrangement> collection) {
+        List<ExamArrangementVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamArrangementVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamArrangement> page = (Page<ExamArrangement>)collection;
+            Page<ExamArrangementVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamArrangementAddBo bo) {
+        ExamArrangement add = BeanUtil.toBean(bo, ExamArrangement.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamArrangementEditBo bo) {
+        ExamArrangement update = BeanUtil.toBean(bo, ExamArrangement.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamArrangement 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/ExamArrangementStudentServiceImpl.java

@@ -0,0 +1,94 @@
+package com.zhongzheng.modules.exam.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.exam.bo.ExamArrangementStudentAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementStudentQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementStudentEditBo;
+import com.zhongzheng.modules.exam.domain.ExamArrangementStudent;
+import com.zhongzheng.modules.exam.mapper.ExamArrangementStudentMapper;
+import com.zhongzheng.modules.exam.vo.ExamArrangementStudentVo;
+import com.zhongzheng.modules.exam.service.IExamArrangementStudentService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 报名考试得学生关联Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Service
+public class ExamArrangementStudentServiceImpl extends ServiceImpl<ExamArrangementStudentMapper, ExamArrangementStudent> implements IExamArrangementStudentService {
+
+    @Override
+    public ExamArrangementStudentVo queryById(Long arrangementId){
+        ExamArrangementStudent db = this.baseMapper.selectById(arrangementId);
+        return BeanUtil.toBean(db, ExamArrangementStudentVo.class);
+    }
+
+    @Override
+    public List<ExamArrangementStudentVo> queryList(ExamArrangementStudentQueryBo bo) {
+        LambdaQueryWrapper<ExamArrangementStudent> lqw = Wrappers.lambdaQuery();
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamArrangementStudentVo> entity2Vo(Collection<ExamArrangementStudent> collection) {
+        List<ExamArrangementStudentVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamArrangementStudentVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamArrangementStudent> page = (Page<ExamArrangementStudent>)collection;
+            Page<ExamArrangementStudentVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamArrangementStudentAddBo bo) {
+        ExamArrangementStudent add = BeanUtil.toBean(bo, ExamArrangementStudent.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamArrangementStudentEditBo bo) {
+        ExamArrangementStudent update = BeanUtil.toBean(bo, ExamArrangementStudent.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamArrangementStudent 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/ExamArrangementTimeServiceImpl.java

@@ -0,0 +1,96 @@
+package com.zhongzheng.modules.exam.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.ExamArrangementTimeAddBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementTimeQueryBo;
+import com.zhongzheng.modules.exam.bo.ExamArrangementTimeEditBo;
+import com.zhongzheng.modules.exam.domain.ExamArrangementTime;
+import com.zhongzheng.modules.exam.mapper.ExamArrangementTimeMapper;
+import com.zhongzheng.modules.exam.vo.ExamArrangementTimeVo;
+import com.zhongzheng.modules.exam.service.IExamArrangementTimeService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 考试时间段安排Service业务层处理
+ *
+ * @author change
+ * @date 2021-05-20
+ */
+@Service
+public class ExamArrangementTimeServiceImpl extends ServiceImpl<ExamArrangementTimeMapper, ExamArrangementTime> implements IExamArrangementTimeService {
+
+    @Override
+    public ExamArrangementTimeVo queryById(Long arrangementId){
+        ExamArrangementTime db = this.baseMapper.selectById(arrangementId);
+        return BeanUtil.toBean(db, ExamArrangementTimeVo.class);
+    }
+
+    @Override
+    public List<ExamArrangementTimeVo> queryList(ExamArrangementTimeQueryBo bo) {
+        LambdaQueryWrapper<ExamArrangementTime> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStartTime() != null, ExamArrangementTime::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, ExamArrangementTime::getEndTime, bo.getEndTime());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ExamArrangementTimeVo> entity2Vo(Collection<ExamArrangementTime> collection) {
+        List<ExamArrangementTimeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ExamArrangementTimeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ExamArrangementTime> page = (Page<ExamArrangementTime>)collection;
+            Page<ExamArrangementTimeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ExamArrangementTimeAddBo bo) {
+        ExamArrangementTime add = BeanUtil.toBean(bo, ExamArrangementTime.class);
+        validEntityBeforeSave(add);
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ExamArrangementTimeEditBo bo) {
+        ExamArrangementTime update = BeanUtil.toBean(bo, ExamArrangementTime.class);
+        validEntityBeforeSave(update);
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ExamArrangementTime 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/vo/ExamArrangementStudentVo.java

@@ -0,0 +1,28 @@
+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 change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("报名考试得学生关联视图对象")
+public class ExamArrangementStudentVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long arrangementId;
+
+
+}

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

@@ -0,0 +1,36 @@
+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 change
+ * @date 2021-05-20
+ */
+@Data
+@ApiModel("考试时间段安排视图对象")
+public class ExamArrangementTimeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** exam_arrangement关联表id */
+	@ApiModelProperty("exam_arrangement关联表id")
+	private Long arrangementId;
+
+	/** 考试开始时间 */
+	@Excel(name = "考试开始时间")
+	@ApiModelProperty("考试开始时间")
+	private Long startTime;
+	/** 考试结束时间 */
+	@Excel(name = "考试结束时间")
+	@ApiModelProperty("考试结束时间")
+	private Long endTime;
+
+}

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

@@ -0,0 +1,112 @@
+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 change
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("考试安排，包含考试指引视图对象")
+public class ExamArrangementVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 主键 */
+	@ApiModelProperty("主键")
+	private Long id;
+
+	/** 考试类型id */
+	@Excel(name = "考试类型id")
+	@ApiModelProperty("考试类型id")
+	private Long examTypeId;
+	/** 考试类型 */
+	@Excel(name = "考试类型")
+	@ApiModelProperty("考试类型")
+	private String examType;
+	/** 报名开始时间 */
+	@Excel(name = "报名开始时间")
+	@ApiModelProperty("报名开始时间")
+	private Long signStartTime;
+	/** 报名结束时间 */
+	@Excel(name = "报名结束时间")
+	@ApiModelProperty("报名结束时间")
+	private Long signEndTime;
+	/** 考试地点 */
+	@Excel(name = "考试地点")
+	@ApiModelProperty("考试地点")
+	private String examAdress;
+	/** 报名网址 */
+	@Excel(name = "报名网址")
+	@ApiModelProperty("报名网址")
+	private String examUrl;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remarks;
+	/** 0手动发布  3定时发布 4已结束 */
+	@Excel(name = "0手动发布  3定时发布 4已结束")
+	@ApiModelProperty("0手动发布  3定时发布 4已结束")
+	private Integer release;
+	/** 订阅人数 */
+	@Excel(name = "订阅人数")
+	@ApiModelProperty("订阅人数")
+	private Integer subscrPe;
+	/** 报名人数 */
+	@Excel(name = "报名人数")
+	@ApiModelProperty("报名人数")
+	private Integer signUpPe;
+	/** 定时发布的时间 */
+	@Excel(name = "定时发布的时间")
+	@ApiModelProperty("定时发布的时间")
+	private Long releaseTime;
+	/** 发布时间 */
+	@Excel(name = "发布时间")
+	@ApiModelProperty("发布时间")
+	private Long examTime;
+	/** 报名考试指引 */
+	@Excel(name = "报名考试指引")
+	@ApiModelProperty("报名考试指引")
+	private String regGuide;
+	/** 考试期次 */
+	@Excel(name = "考试期次")
+	@ApiModelProperty("考试期次")
+	private String examPeriod;
+	/** 0删除 1待发布 2 撤回 3发布成功 */
+	@Excel(name = "0删除 1待发布 2 撤回 3发布成功")
+	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
+	private Integer status;
+	/** 0 笔试  1机考 */
+	@Excel(name = "0 笔试  1机考")
+	@ApiModelProperty("0 笔试  1机考")
+	private Integer examForm;
+	/** 考试通知网址 */
+	@Excel(name = "考试通知网址")
+	@ApiModelProperty("考试通知网址")
+	private String examFromUrl;
+	/** 打印网址 */
+	@Excel(name = "打印网址")
+	@ApiModelProperty("打印网址")
+	private String printUrl;
+	/** 成绩查询 */
+	@Excel(name = "成绩查询")
+	@ApiModelProperty("成绩查询")
+	private String gradesUrl;
+	/** 分数线查询 */
+	@Excel(name = "分数线查询")
+	@ApiModelProperty("分数线查询")
+	private String scoreLineUrl;
+	/** 申领证书 */
+	@Excel(name = "申领证书")
+	@ApiModelProperty("申领证书")
+	private String certificate;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityAdvertisingMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.ActivityAdvertisingMapper">
+<mapper namespace="com.zhongzheng.modules.activity.mapper.ActivityAdvertisingMapper">
 
     <resultMap type="com.zhongzheng.modules.activity.domain.ActivityAdvertising" id="ActivityAdvertisingResult">
         <result property="id" column="id"/>
@@ -15,7 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks" column="remarks"/>
         <result property="reStatus" column="re_status"/>
         <result property="status" column="status"/>
-        <result property="releaseTime" column="release_time"/>
         <result property="advName" column="adv_name"/>
     </resultMap>
 

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationCourseMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.system.mapper.ActivityConfigurationCourseMapper">
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityConfigurationCourse" id="ActivityConfigurationCourseResult">
+        <result property="configurationId" column="configuration_id"/>
+        <result property="courseId" column="course_id"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.ActivityConfigurationMapper">
+<mapper namespace="com.zhongzheng.modules.activity.mapper.ActivityConfigurationMapper">
 
     <resultMap type="com.zhongzheng.modules.activity.domain.ActivityConfiguration" id="ActivityConfigurationResult">
         <result property="id" column="id"/>
@@ -22,5 +22,160 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.activity.vo.ActivityConfigurationVo" id="ActivityConfigurationResultVO">
+        <result property="id" column="id"/>
+        <result property="activityName" column="activity_name"/>
+        <result property="activityType" column="activity_type"/>
+        <result property="description" column="description"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="price" column="price"/>
+        <result property="quantity" column="quantity"/>
+        <result property="validityTime" column="validity_time"/>
+        <result property="discount" column="discount"/>
+        <result property="liveContent" column="live_content"/>
+        <result property="liveAdress" column="live_adress"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <collection property="courses" javaType="java.util.List" resultMap="CourseResult"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.course.domain.Course" id="CourseResult">
+        <result property="courseId" column="course_id"/>
+        <result property="categoryId" column="category_id"/>
+        <result property="price" column="price"/>
+        <result property="duration" column="duration"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="introduction" column="introduction"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="teacherIds" column="teacher_ids"/>
+        <result property="courseName" column="course_name"/>
+    </resultMap>
+
+    <select id="selectConfiguraList" parameterType="com.zhongzheng.modules.activity.bo.ActivityConfigurationQueryBo" resultMap="ActivityConfigurationResultVO">
+        SELECT
+        c.*,
+        s.*
+        FROM
+        activity_configuration c
+        LEFT JOIN activity_configuration_course f ON c.id = f.configuration_id
+        LEFT JOIN course s ON f.configuration_id = s.course_id
+        WHERE 1=1
+        <if test="id != null" >
+            and c.id = #{id,jdbcType=INTEGER}
+        </if>
+        <if test="activityName != null" >
+            and c.activity_name = #{activityName,jdbcType=VARCHAR}
+        </if>
+        <if test="activityType != null" >
+            and c.activity_type = #{activityType,jdbcType=VARCHAR}
+        </if>
+        <if test="description != null" >
+            and c.description = #{description,jdbcType=VARCHAR}
+        </if>
+        <if test="startTime != null" >
+            and c.start_time = #{startTime,jdbcType=INTEGER}
+        </if>
+        <if test="endTime != null" >
+            and c.end_time = #{endTime,jdbcType=INTEGER}
+        </if>
+        <if test="price != null" >
+            and c.price = #{price,jdbcType=DECIMAL}
+        </if>
+        <if test="quantity != null" >
+            and c.quantity = #{quantity,jdbcType=INTEGER}
+        </if>
+        <if test="validityTime != null" >
+            and c.validity_time = #{validityTime,jdbcType=INTEGER}
+        </if>
+        <if test="discount != null" >
+            and c.discount = #{discount,jdbcType=VARCHAR}
+        </if>
+        <if test="liveContent != null" >
+            and c.live_content = #{liveContent,jdbcType=VARCHAR}
+        </if>
+        <if test="liveAdress != null" >
+            and c.live_adress = #{liveAdress,jdbcType=VARCHAR}
+        </if>
+        <if test="createTime != null" >
+            and c.create_time = #{createTime,jdbcType=INTEGER}
+        </if>
+        <if test="updateTime != null" >
+            and c.update_time = #{updateTime,jdbcType=INTEGER}
+        </if>
+        <choose>
+            <when test="status !=null and status != ''">
+                and c.status = #{status,jdbcType=TINYINT}
+            </when>
+            <otherwise>
+                and c.status != 0
+            </otherwise>
+        </choose>
+    </select>
 
+    <select id="selectConfigures" parameterType="java.lang.Long" resultMap="ActivityConfigurationResultVO">
+        SELECT
+        c.*,
+        s.*
+        FROM
+        activity_configuration c
+        LEFT JOIN activity_configuration_course f ON c.id = f.configuration_id
+        LEFT JOIN course s ON f.configuration_id = s.course_id
+        WHERE 1=1
+        <if test="id != null" >
+            and c.id = #{id,jdbcType=INTEGER}
+        </if>
+        <if test="activityName != null" >
+            and c.activity_name = #{activityName,jdbcType=VARCHAR}
+        </if>
+        <if test="activityType != null" >
+            and c.activity_type = #{activityType,jdbcType=VARCHAR}
+        </if>
+        <if test="description != null" >
+            and c.description = #{description,jdbcType=VARCHAR}
+        </if>
+        <if test="startTime != null" >
+            and c.start_time = #{startTime,jdbcType=INTEGER}
+        </if>
+        <if test="endTime != null" >
+            and c.end_time = #{endTime,jdbcType=INTEGER}
+        </if>
+        <if test="price != null" >
+            and c.price = #{price,jdbcType=DECIMAL}
+        </if>
+        <if test="quantity != null" >
+            and c.quantity = #{quantity,jdbcType=INTEGER}
+        </if>
+        <if test="validityTime != null" >
+            and c.validity_time = #{validityTime,jdbcType=INTEGER}
+        </if>
+        <if test="discount != null" >
+            and c.discount = #{discount,jdbcType=VARCHAR}
+        </if>
+        <if test="liveContent != null" >
+            and c.live_content = #{liveContent,jdbcType=VARCHAR}
+        </if>
+        <if test="liveAdress != null" >
+            and c.live_adress = #{liveAdress,jdbcType=VARCHAR}
+        </if>
+        <if test="createTime != null" >
+            and c.create_time = #{createTime,jdbcType=INTEGER}
+        </if>
+        <if test="updateTime != null" >
+            and c.update_time = #{updateTime,jdbcType=INTEGER}
+        </if>
+        <choose>
+            <when test="status !=null and status != ''">
+                and c.status = #{status,jdbcType=TINYINT}
+            </when>
+            <otherwise>
+                and c.status != 0
+            </otherwise>
+        </choose>
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityGradeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.ActivityGradeMapper">
+<mapper namespace="com.zhongzheng.modules.activity.mapper.ActivityGradeMapper">
 
     <resultMap type="com.zhongzheng.modules.activity.domain.ActivityGrade" id="ActivityGradeResult">
         <result property="id" column="id"/>
@@ -15,5 +15,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.activity.vo.ActivityGradeVo" id="ActivityGradeVoResult">
+        <result property="id" column="id"/>
+        <result property="grade" column="grade"/>
+        <result property="gradeName" column="grade_name"/>
+        <result property="needIntegralStart" column="need_integral_start"/>
+        <result property="needIntegralEnd" column="need_integral_end"/>
+        <result property="remarks" column="remarks"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <collection property="activityGradePrivilegesVo" javaType="java.util.List" resultMap="ActivityGradePrivilegeResult"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityGradePrivilege" id="ActivityGradePrivilegeResult">
+        <result property="id" column="id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="priType" column="pri_type"/>
+        <result property="couponPrice" column="coupon_price"/>
+        <result property="discount" column="discount"/>
+        <result property="endTimeSum" column="end_time_sum"/>
+        <result property="quantity" column="quantity"/>
+    </resultMap>
+
+    <select id="selectGradeList" parameterType="com.zhongzheng.modules.activity.vo.ActivityGradeVo" resultMap="ActivityGradeVoResult">
+        SELECT
+            c.*,
+            f.*
+        FROM
+            activity_grade c
+                LEFT JOIN activity_grade_privilege f ON c.id = f.grade_id
+        WHERE 1=1
+    </select>
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityGradePrivilegeCouresMapper.xml

@@ -0,0 +1,13 @@
+<?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.activity.mapper.ActivityGradePrivilegeCouresMapper">
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityGradePrivilegeCoures" id="ActivityGradePrivilegeCouresResult">
+        <result property="privilegeId" column="privilege_id"/>
+        <result property="courseId" column="course_id"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityGradePrivilegeMapper.xml

@@ -0,0 +1,56 @@
+<?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.activity.mapper.ActivityGradePrivilegeMapper">
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityGradePrivilege" id="ActivityGradePrivilegeResult">
+        <result property="id" column="id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="priType" column="pri_type"/>
+        <result property="couponPrice" column="coupon_price"/>
+        <result property="discount" column="discount"/>
+        <result property="endTimeSum" column="end_time_sum"/>
+        <result property="quantity" column="quantity"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.activity.vo.ActivityGradePrivilegeVo" id="ActivityGradePrivilegeVoResult">
+        <result property="id" column="id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="priType" column="pri_type"/>
+        <result property="couponPrice" column="coupon_price"/>
+        <result property="discount" column="discount"/>
+        <result property="endTimeSum" column="end_time_sum"/>
+        <result property="quantity" column="quantity"/>
+        <collection property="courseVo" javaType="java.util.List" resultMap="CourseResult"/>
+    </resultMap>
+
+    <resultMap type="com.zhongzheng.modules.course.domain.Course" id="CourseResult">
+        <result property="courseId" column="course_id"/>
+        <result property="categoryId" column="category_id"/>
+        <result property="price" column="price"/>
+        <result property="duration" column="duration"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="coverUrl" column="cover_url"/>
+        <result property="introduction" column="introduction"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="teacherIds" column="teacher_ids"/>
+        <result property="courseName" column="course_name"/>
+    </resultMap>
+
+
+
+    <select id="selectGradePriList" parameterType="Long" resultMap="ActivityGradePrivilegeVoResult">
+        SELECT
+            c.*,
+            e.*
+        FROM
+            activity_grade_privilege c
+                LEFT JOIN activity_grade_privilege_coures f ON c.id = f.privilege_id
+                LEFT JOIN course e ON f.course_id = e.course_id
+        WHERE c.grade_id = #{id,jdbcType=INTEGER}
+    </select>
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityTaskMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.ActivityTaskMapper">
+<mapper namespace="com.zhongzheng.modules.activity.mapper.ActivityTaskMapper">
 
     <resultMap type="com.zhongzheng.modules.activity.domain.ActivityTask" id="ActivityTaskResult">
         <result property="id" column="id"/>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityTaskTimeMapper.xml

@@ -0,0 +1,15 @@
+<?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.activity.mapper.ActivityTaskTimeMapper">
+
+    <resultMap type="com.zhongzheng.modules.activity.domain.ActivityTaskTime" id="ActivityTaskTimeResult">
+        <result property="taskId" column="task_id"/>
+        <result property="startRange" column="start_range"/>
+        <result property="endRange" column="end_range"/>
+        <result property="integral" column="integral"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,35 @@
+<?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.ExamArrangementMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamArrangement" id="ExamArrangementResult">
+        <result property="id" column="id"/>
+        <result property="examTypeId" column="exam_type_id"/>
+        <result property="examType" column="exam_type"/>
+        <result property="signStartTime" column="sign_start_time"/>
+        <result property="signEndTime" column="sign_end_time"/>
+        <result property="examAdress" column="exam_adress"/>
+        <result property="examUrl" column="exam_url"/>
+        <result property="remarks" column="remarks"/>
+        <result property="release" column="release"/>
+        <result property="subscrPe" column="subscr_pe"/>
+        <result property="signUpPe" column="sign_up_pe"/>
+        <result property="releaseTime" column="release_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="examTime" column="exam_time"/>
+        <result property="regGuide" column="reg_guide"/>
+        <result property="examPeriod" column="exam_period"/>
+        <result property="status" column="status"/>
+        <result property="examForm" column="exam_form"/>
+        <result property="examFromUrl" column="exam_from_url"/>
+        <result property="printUrl" column="print_url"/>
+        <result property="gradesUrl" column="grades_url"/>
+        <result property="scoreLineUrl" column="score_line_url"/>
+        <result property="certificate" column="certificate"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,13 @@
+<?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.ExamArrangementStudentMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamArrangementStudent" id="ExamArrangementStudentResult">
+        <result property="arrangementId" column="arrangement_id"/>
+        <result property="studentId" column="student_id"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -0,0 +1,14 @@
+<?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.ExamArrangementTimeMapper">
+
+    <resultMap type="com.zhongzheng.modules.exam.domain.ExamArrangementTime" id="ExamArrangementTimeResult">
+        <result property="arrangementId" column="arrangement_id"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+    </resultMap>
+
+
+</mapper>