change 4 жил өмнө
parent
commit
c1d09f558a
28 өөрчлөгдсөн 1498 нэмэгдсэн , 0 устгасан
  1. 112 0
      zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java
  2. 76 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeAddBo.java
  3. 94 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeEditBo.java
  4. 33 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeGoodsAddBo.java
  5. 33 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeGoodsEditBo.java
  6. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeGoodsQueryBo.java
  7. 39 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeInterfaceAddBo.java
  8. 45 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeInterfaceEditBo.java
  9. 48 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeInterfaceQueryBo.java
  10. 85 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java
  11. 68 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java
  12. 36 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeGoods.java
  13. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeInterface.java
  14. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeGoodsMapper.java
  15. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeInterfaceMapper.java
  16. 14 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java
  17. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeGoodsService.java
  18. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeInterfaceService.java
  19. 52 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeService.java
  20. 100 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeGoodsServiceImpl.java
  21. 101 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeInterfaceServiceImpl.java
  22. 113 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java
  23. 31 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeGoodsVo.java
  24. 43 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeInterfaceVo.java
  25. 92 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java
  26. 15 0
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeGoodsMapper.xml
  27. 18 0
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeInterfaceMapper.xml
  28. 30 0
      zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

+ 112 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.grade;
+
+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.grade.vo.ClassGradeVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeEditBo;
+import com.zhongzheng.modules.grade.service.IClassGradeService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 班级Controller
+ * 
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Api(value = "班级控制器", tags = {"班级管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/modules.grade/grade")
+public class ClassGradeController extends BaseController {
+
+    private final IClassGradeService iClassGradeService;
+
+    /**
+     * 查询班级列表
+     */
+    @ApiOperation("查询班级列表")
+    @PreAuthorize("@ss.hasPermi('modules.grade:grade:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ClassGradeVo> list(ClassGradeQueryBo bo) {
+        startPage();
+        List<ClassGradeVo> list = iClassGradeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出班级列表
+     */
+    @ApiOperation("导出班级列表")
+    @PreAuthorize("@ss.hasPermi('modules.grade:grade:export')")
+    @Log(title = "班级", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<ClassGradeVo> export(ClassGradeQueryBo bo) {
+        List<ClassGradeVo> list = iClassGradeService.queryList(bo);
+        ExcelUtil<ClassGradeVo> util = new ExcelUtil<ClassGradeVo>(ClassGradeVo.class);
+        return util.exportExcel(list, "班级");
+    }
+
+    /**
+     * 获取班级详细信息
+     */
+    @ApiOperation("获取班级详细信息")
+    @PreAuthorize("@ss.hasPermi('modules.grade:grade:query')")
+    @GetMapping("/{classId}")
+    public AjaxResult<ClassGradeVo> getInfo(@PathVariable("classId" ) Long classId) {
+        return AjaxResult.success(iClassGradeService.queryById(classId));
+    }
+
+    /**
+     * 新增班级
+     */
+    @ApiOperation("新增班级")
+    @PreAuthorize("@ss.hasPermi('modules.grade:grade:add')")
+    @Log(title = "班级", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody ClassGradeAddBo bo) {
+        return toAjax(iClassGradeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改班级
+     */
+    @ApiOperation("修改班级")
+    @PreAuthorize("@ss.hasPermi('modules.grade:grade:edit')")
+    @Log(title = "班级", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody ClassGradeEditBo bo) {
+        return toAjax(iClassGradeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除班级
+     */
+    @ApiOperation("删除班级")
+    @PreAuthorize("@ss.hasPermi('modules.grade:grade:remove')")
+    @Log(title = "班级" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{classIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] classIds) {
+        return toAjax(iClassGradeService.deleteWithValidByIds(Arrays.asList(classIds), true) ? 1 : 0);
+    }
+}

+ 76 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeAddBo.java

@@ -0,0 +1,76 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 班级添加对象 class_grade
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班级添加对象")
+public class ClassGradeAddBo {
+
+    /** 开班状态 0未开班 1开班 */
+    @ApiModelProperty("开班状态 0未开班 1开班")
+    private Integer classStatus;
+    /** 官方班级 */
+    @ApiModelProperty("官方班级")
+    private String officialName;
+    /** 班级名称 */
+    @ApiModelProperty("班级名称")
+    private String className;
+    /** 学员上限 */
+    @ApiModelProperty("学员上限")
+    private Integer studentUpper;
+    /** 开放学习时间 */
+    @ApiModelProperty("开放学习时间")
+    private Long learningTimeStart;
+    /** 即刻 1  待定2  日期3 */
+    @ApiModelProperty("即刻 1  待定2  日期3")
+    private Integer learningStatus;
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+    /** 班级有效期开始时间 */
+    @ApiModelProperty("班级有效期开始时间")
+    private Long classStartTime;
+    /** 班级有效期结束时间 */
+    @ApiModelProperty("班级有效期结束时间")
+    private Long classEndTime;
+    /** 考期 */
+    @ApiModelProperty("考期")
+    private Long examineId;
+    /** 报考地区 */
+    @ApiModelProperty("报考地区")
+    private Long areasId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 班主任ID */
+    @ApiModelProperty("班主任ID")
+    private Long sysUserId;
+
+    /** 官方信息推送接口 */
+    @ApiModelProperty("官方信息推送接口")
+    private Long interfacePushId;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 官方账号开通 */
+    @ApiModelProperty("官方账号开通")
+    private Long interfaceAccountId;
+    /** 学时推送 */
+    @ApiModelProperty("学时推送")
+    private Long interfacePeriodId;
+}

+ 94 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeEditBo.java

@@ -0,0 +1,94 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 班级编辑对象 class_grade
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班级编辑对象")
+public class ClassGradeEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long classId;
+
+    /** 开班状态 0未开班 1开班 */
+    @ApiModelProperty("开班状态 0未开班 1开班")
+    private Integer classStatus;
+
+    /** 官方班级 */
+    @ApiModelProperty("官方班级")
+    private String officialName;
+
+    /** 班级名称 */
+    @ApiModelProperty("班级名称")
+    private String className;
+
+    /** 学员上限 */
+    @ApiModelProperty("学员上限")
+    private Integer studentUpper;
+
+    /** 开放学习时间 */
+    @ApiModelProperty("开放学习时间")
+    private Long learningTimeStart;
+
+    /** 即刻 1  待定2  日期3 */
+    @ApiModelProperty("即刻 1  待定2  日期3")
+    private Integer learningStatus;
+
+    /** 1有效 0无效 */
+    @ApiModelProperty("1有效 0无效")
+    private Integer status;
+
+    /** 班级有效期开始时间 */
+    @ApiModelProperty("班级有效期开始时间")
+    private Long classStartTime;
+
+    /** 班级有效期结束时间 */
+    @ApiModelProperty("班级有效期结束时间")
+    private Long classEndTime;
+
+    /** 考期 */
+    @ApiModelProperty("考期")
+    private Long examineId;
+
+    /** 报考地区 */
+    @ApiModelProperty("报考地区")
+    private Long areasId;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 班主任ID */
+    @ApiModelProperty("班主任ID")
+    private Long sysUserId;
+
+
+    /** 官方信息推送接口 */
+    @ApiModelProperty("官方信息推送接口")
+    private Long interfacePushId;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 官方账号开通 */
+    @ApiModelProperty("官方账号开通")
+    private Long interfaceAccountId;
+
+    /** 学时推送 */
+    @ApiModelProperty("学时推送")
+    private Long interfacePeriodId;
+
+}

+ 33 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeGoodsAddBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 班级关联商品添加对象 class_grade_goods
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班级关联商品添加对象")
+public class ClassGradeGoodsAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long gradeId;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long goodsId;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

+ 33 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeGoodsEditBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 班级关联商品编辑对象 class_grade_goods
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班级关联商品编辑对象")
+public class ClassGradeGoodsEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long gradeId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long goodsId;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

+ 45 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeGoodsQueryBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 班级关联商品分页查询对象 class_grade_goods
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("班级关联商品分页查询对象")
+public class ClassGradeGoodsQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long gradeId;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long goodsId;
+}

+ 39 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeInterfaceAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 官方接口添加对象 class_grade_interface
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("官方接口添加对象")
+public class ClassGradeInterfaceAddBo {
+
+    /** 1官方推送 2官方学习账号开通 3官方学时推送 */
+    @ApiModelProperty("1官方推送 2官方学习账号开通 3官方学时推送")
+    private Integer type;
+    /** 官方接口名称 */
+    @ApiModelProperty("官方接口名称")
+    private String name;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

+ 45 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeInterfaceEditBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.grade.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 官方接口编辑对象 class_grade_interface
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("官方接口编辑对象")
+public class ClassGradeInterfaceEditBo {
+
+    /** 官方接口id */
+    @ApiModelProperty("官方接口id")
+    private Long id;
+
+    /** 1官方推送 2官方学习账号开通 3官方学时推送 */
+    @ApiModelProperty("1官方推送 2官方学习账号开通 3官方学时推送")
+    private Integer type;
+
+    /** 官方接口名称 */
+    @ApiModelProperty("官方接口名称")
+    private String name;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 0 禁用 1启用 */
+    @ApiModelProperty("0 禁用 1启用")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

+ 48 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeInterfaceQueryBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 官方接口分页查询对象 class_grade_interface
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("官方接口分页查询对象")
+public class ClassGradeInterfaceQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 1官方推送 2官方学习账号开通 3官方学时推送 */
+	@ApiModelProperty("1官方推送 2官方学习账号开通 3官方学时推送")
+	private Integer type;
+	/** 官方接口名称 */
+	@ApiModelProperty("官方接口名称")
+	private String name;
+	/** 0 禁用 1启用 */
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+}

+ 85 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -0,0 +1,85 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 班级分页查询对象 class_grade
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("班级分页查询对象")
+public class ClassGradeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 开班状态 0未开班 1开班 */
+	@ApiModelProperty("开班状态 0未开班 1开班")
+	private Integer classStatus;
+	/** 官方班级 */
+	@ApiModelProperty("官方班级")
+	private String officialName;
+	/** 班级名称 */
+	@ApiModelProperty("班级名称")
+	private String className;
+	/** 学员上限 */
+	@ApiModelProperty("学员上限")
+	private Integer studentUpper;
+	/** 开放学习时间 */
+	@ApiModelProperty("开放学习时间")
+	private Long learningTimeStart;
+	/** 即刻 1  待定2  日期3 */
+	@ApiModelProperty("即刻 1  待定2  日期3")
+	private Integer learningStatus;
+	/** 1有效 0无效 */
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+	/** 班级有效期开始时间 */
+	@ApiModelProperty("班级有效期开始时间")
+	private Long classStartTime;
+	/** 班级有效期结束时间 */
+	@ApiModelProperty("班级有效期结束时间")
+	private Long classEndTime;
+	/** 考期 */
+	@ApiModelProperty("考期")
+	private Long examineId;
+	/** 报考地区 */
+	@ApiModelProperty("报考地区")
+	private Long areasId;
+	/** 班主任ID */
+	@ApiModelProperty("班主任ID")
+	private Long sysUserId;
+
+	/** 官方信息推送接口 */
+	@ApiModelProperty("官方信息推送接口")
+	private Long interfacePushId;
+	/** 官方账号开通 */
+	@ApiModelProperty("官方账号开通")
+	private Long interfaceAccountId;
+	/** 学时推送 */
+	@ApiModelProperty("学时推送")
+	private Long interfacePeriodId;
+}

+ 68 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -0,0 +1,68 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 班级对象 class_grade
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("class_grade")
+public class ClassGrade implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "class_id")
+    private Long classId;
+    /** 开班状态 0未开班 1开班 */
+    private Integer classStatus;
+    /** 官方班级 */
+    private String officialName;
+    /** 班级名称 */
+    private String className;
+    /** 学员上限 */
+    private Integer studentUpper;
+    /** 开放学习时间 */
+    private Long learningTimeStart;
+    /** 即刻 1  待定2  日期3 */
+    private Integer learningStatus;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 班级有效期开始时间 */
+    private Long classStartTime;
+    /** 班级有效期结束时间 */
+    private Long classEndTime;
+    /** 考期 */
+    private Long examineId;
+    /** 报考地区 */
+    private Long areasId;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 班主任ID */
+    private Long sysUserId;
+
+    /** 官方信息推送接口 */
+    private Long interfacePushId;
+    /** 备注 */
+    private String remark;
+    /** 官方账号开通 */
+    private Long interfaceAccountId;
+    /** 学时推送 */
+    private Long interfacePeriodId;
+}

+ 36 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeGoods.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 班级关联商品对象 class_grade_goods
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("class_grade_goods")
+public class ClassGradeGoods implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    private Long gradeId;
+    /** $column.columnComment */
+    private Long goodsId;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeInterface.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.grade.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;
+
+/**
+ * 官方接口对象 class_grade_interface
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("class_grade_interface")
+public class ClassGradeInterface implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** 官方接口id */
+    @TableId(value = "id")
+    private Long id;
+    /** 1官方推送 2官方学习账号开通 3官方学时推送 */
+    private Integer type;
+    /** 官方接口名称 */
+    private String name;
+    /** 备注 */
+    private String remark;
+    /** 0 禁用 1启用 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeGoodsMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.grade.mapper;
+
+import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 班级关联商品Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface ClassGradeGoodsMapper extends BaseMapper<ClassGradeGoods> {
+
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeInterfaceMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.grade.mapper;
+
+import com.zhongzheng.modules.grade.domain.ClassGradeInterface;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 官方接口Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface ClassGradeInterfaceMapper extends BaseMapper<ClassGradeInterface> {
+
+}

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.grade.mapper;
+
+import com.zhongzheng.modules.grade.domain.ClassGrade;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 班级Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
+
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeGoodsService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.grade.service;
+
+import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
+import com.zhongzheng.modules.grade.vo.ClassGradeGoodsVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeGoodsQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeGoodsAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeGoodsEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 班级关联商品Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface IClassGradeGoodsService extends IService<ClassGradeGoods> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ClassGradeGoodsVo queryById(Long gradeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ClassGradeGoodsVo> queryList(ClassGradeGoodsQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入班级关联商品
+	 * @param bo 班级关联商品新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ClassGradeGoodsAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改班级关联商品
+	 * @param bo 班级关联商品编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ClassGradeGoodsEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeInterfaceService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.grade.service;
+
+import com.zhongzheng.modules.grade.domain.ClassGradeInterface;
+import com.zhongzheng.modules.grade.vo.ClassGradeInterfaceVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeInterfaceQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeInterfaceAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeInterfaceEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 官方接口Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface IClassGradeInterfaceService extends IService<ClassGradeInterface> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ClassGradeInterfaceVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<ClassGradeInterfaceVo> queryList(ClassGradeInterfaceQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入官方接口
+	 * @param bo 官方接口新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ClassGradeInterfaceAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改官方接口
+	 * @param bo 官方接口编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ClassGradeInterfaceEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 52 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/IClassGradeService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.grade.service;
+
+import com.zhongzheng.modules.grade.domain.ClassGrade;
+import com.zhongzheng.modules.grade.vo.ClassGradeVo;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 班级Service接口
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+public interface IClassGradeService extends IService<ClassGrade> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	ClassGradeVo queryById(Long classId);
+
+	/**
+	 * 查询列表
+	 */
+	List<ClassGradeVo> queryList(ClassGradeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入班级
+	 * @param bo 班级新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(ClassGradeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改班级
+	 * @param bo 班级编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(ClassGradeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 100 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeGoodsServiceImpl.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.grade.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.grade.bo.ClassGradeGoodsAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeGoodsQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeGoodsEditBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
+import com.zhongzheng.modules.grade.mapper.ClassGradeGoodsMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeGoodsVo;
+import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 班级关联商品Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Service
+public class ClassGradeGoodsServiceImpl extends ServiceImpl<ClassGradeGoodsMapper, ClassGradeGoods> implements IClassGradeGoodsService {
+
+    @Override
+    public ClassGradeGoodsVo queryById(Long gradeId){
+        ClassGradeGoods db = this.baseMapper.selectById(gradeId);
+        return BeanUtil.toBean(db, ClassGradeGoodsVo.class);
+    }
+
+    @Override
+    public List<ClassGradeGoodsVo> queryList(ClassGradeGoodsQueryBo bo) {
+        LambdaQueryWrapper<ClassGradeGoods> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getGradeId() != null, ClassGradeGoods::getGradeId, bo.getGradeId());
+        lqw.eq(bo.getGoodsId() != null, ClassGradeGoods::getGoodsId, bo.getGoodsId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ClassGradeGoodsVo> entity2Vo(Collection<ClassGradeGoods> collection) {
+        List<ClassGradeGoodsVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ClassGradeGoodsVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ClassGradeGoods> page = (Page<ClassGradeGoods>)collection;
+            Page<ClassGradeGoodsVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ClassGradeGoodsAddBo bo) {
+        ClassGradeGoods add = BeanUtil.toBean(bo, ClassGradeGoods.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ClassGradeGoodsEditBo bo) {
+        ClassGradeGoods update = BeanUtil.toBean(bo, ClassGradeGoods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ClassGradeGoods entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 101 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeInterfaceServiceImpl.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.grade.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.grade.bo.ClassGradeInterfaceAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeInterfaceQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeInterfaceEditBo;
+import com.zhongzheng.modules.grade.domain.ClassGradeInterface;
+import com.zhongzheng.modules.grade.mapper.ClassGradeInterfaceMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeInterfaceVo;
+import com.zhongzheng.modules.grade.service.IClassGradeInterfaceService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 官方接口Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Service
+public class ClassGradeInterfaceServiceImpl extends ServiceImpl<ClassGradeInterfaceMapper, ClassGradeInterface> implements IClassGradeInterfaceService {
+
+    @Override
+    public ClassGradeInterfaceVo queryById(Long id){
+        ClassGradeInterface db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, ClassGradeInterfaceVo.class);
+    }
+
+    @Override
+    public List<ClassGradeInterfaceVo> queryList(ClassGradeInterfaceQueryBo bo) {
+        LambdaQueryWrapper<ClassGradeInterface> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getType() != null, ClassGradeInterface::getType, bo.getType());
+        lqw.like(StrUtil.isNotBlank(bo.getName()), ClassGradeInterface::getName, bo.getName());
+        lqw.eq(bo.getStatus() != null, ClassGradeInterface::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ClassGradeInterfaceVo> entity2Vo(Collection<ClassGradeInterface> collection) {
+        List<ClassGradeInterfaceVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ClassGradeInterfaceVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ClassGradeInterface> page = (Page<ClassGradeInterface>)collection;
+            Page<ClassGradeInterfaceVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ClassGradeInterfaceAddBo bo) {
+        ClassGradeInterface add = BeanUtil.toBean(bo, ClassGradeInterface.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ClassGradeInterfaceEditBo bo) {
+        ClassGradeInterface update = BeanUtil.toBean(bo, ClassGradeInterface.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ClassGradeInterface entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -0,0 +1,113 @@
+package com.zhongzheng.modules.grade.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.grade.bo.ClassGradeAddBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
+import com.zhongzheng.modules.grade.bo.ClassGradeEditBo;
+import com.zhongzheng.modules.grade.domain.ClassGrade;
+import com.zhongzheng.modules.grade.mapper.ClassGradeMapper;
+import com.zhongzheng.modules.grade.vo.ClassGradeVo;
+import com.zhongzheng.modules.grade.service.IClassGradeService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 班级Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Service
+public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGrade> implements IClassGradeService {
+
+    @Override
+    public ClassGradeVo queryById(Long classId){
+        ClassGrade db = this.baseMapper.selectById(classId);
+        return BeanUtil.toBean(db, ClassGradeVo.class);
+    }
+
+    @Override
+    public List<ClassGradeVo> queryList(ClassGradeQueryBo bo) {
+        LambdaQueryWrapper<ClassGrade> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getClassStatus() != null, ClassGrade::getClassStatus, bo.getClassStatus());
+        lqw.like(StrUtil.isNotBlank(bo.getOfficialName()), ClassGrade::getOfficialName, bo.getOfficialName());
+        lqw.like(StrUtil.isNotBlank(bo.getClassName()), ClassGrade::getClassName, bo.getClassName());
+        lqw.eq(bo.getStudentUpper() != null, ClassGrade::getStudentUpper, bo.getStudentUpper());
+        lqw.eq(bo.getLearningTimeStart() != null, ClassGrade::getLearningTimeStart, bo.getLearningTimeStart());
+        lqw.eq(bo.getLearningStatus() != null, ClassGrade::getLearningStatus, bo.getLearningStatus());
+        lqw.eq(bo.getStatus() != null, ClassGrade::getStatus, bo.getStatus());
+        lqw.eq(bo.getClassStartTime() != null, ClassGrade::getClassStartTime, bo.getClassStartTime());
+        lqw.eq(bo.getClassEndTime() != null, ClassGrade::getClassEndTime, bo.getClassEndTime());
+        lqw.eq(bo.getExamineId() != null, ClassGrade::getExamineId, bo.getExamineId());
+        lqw.eq(bo.getAreasId() != null, ClassGrade::getAreasId, bo.getAreasId());
+        lqw.eq(bo.getSysUserId() != null, ClassGrade::getSysUserId, bo.getSysUserId());
+        lqw.eq(bo.getInterfacePushId() != null, ClassGrade::getInterfacePushId, bo.getInterfacePushId());
+        lqw.eq(bo.getInterfaceAccountId() != null, ClassGrade::getInterfaceAccountId, bo.getInterfaceAccountId());
+        lqw.eq(bo.getInterfacePeriodId() != null, ClassGrade::getInterfacePeriodId, bo.getInterfacePeriodId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<ClassGradeVo> entity2Vo(Collection<ClassGrade> collection) {
+        List<ClassGradeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, ClassGradeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<ClassGrade> page = (Page<ClassGrade>)collection;
+            Page<ClassGradeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(ClassGradeAddBo bo) {
+        ClassGrade add = BeanUtil.toBean(bo, ClassGrade.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(ClassGradeEditBo bo) {
+        ClassGrade update = BeanUtil.toBean(bo, ClassGrade.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(ClassGrade entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

+ 31 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeGoodsVo.java

@@ -0,0 +1,31 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 班级关联商品视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班级关联商品视图对象")
+public class ClassGradeGoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long gradeId;
+
+	/** $column.columnComment */
+	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
+	@ApiModelProperty("$column.columnComment")
+	private Long goodsId;
+}

+ 43 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeInterfaceVo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 官方接口视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("官方接口视图对象")
+public class ClassGradeInterfaceVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 官方接口id */
+	@ApiModelProperty("官方接口id")
+	private Long id;
+
+	/** 1官方推送 2官方学习账号开通 3官方学时推送 */
+	@Excel(name = "1官方推送 2官方学习账号开通 3官方学时推送")
+	@ApiModelProperty("1官方推送 2官方学习账号开通 3官方学时推送")
+	private Integer type;
+	/** 官方接口名称 */
+	@Excel(name = "官方接口名称")
+	@ApiModelProperty("官方接口名称")
+	private String name;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 0 禁用 1启用 */
+	@Excel(name = "0 禁用 1启用")
+	@ApiModelProperty("0 禁用 1启用")
+	private Integer status;
+}

+ 92 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -0,0 +1,92 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 班级视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班级视图对象")
+public class ClassGradeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long classId;
+
+	/** 开班状态 0未开班 1开班 */
+	@Excel(name = "开班状态 0未开班 1开班")
+	@ApiModelProperty("开班状态 0未开班 1开班")
+	private Integer classStatus;
+	/** 官方班级 */
+	@Excel(name = "官方班级")
+	@ApiModelProperty("官方班级")
+	private String officialName;
+	/** 班级名称 */
+	@Excel(name = "班级名称")
+	@ApiModelProperty("班级名称")
+	private String className;
+	/** 学员上限 */
+	@Excel(name = "学员上限")
+	@ApiModelProperty("学员上限")
+	private Integer studentUpper;
+	/** 开放学习时间 */
+	@Excel(name = "开放学习时间")
+	@ApiModelProperty("开放学习时间")
+	private Long learningTimeStart;
+	/** 即刻 1  待定2  日期3 */
+	@Excel(name = "即刻 1  待定2  日期3")
+	@ApiModelProperty("即刻 1  待定2  日期3")
+	private Integer learningStatus;
+	/** 1有效 0无效 */
+	@Excel(name = "1有效 0无效")
+	@ApiModelProperty("1有效 0无效")
+	private Integer status;
+	/** 班级有效期开始时间 */
+	@Excel(name = "班级有效期开始时间")
+	@ApiModelProperty("班级有效期开始时间")
+	private Long classStartTime;
+	/** 班级有效期结束时间 */
+	@Excel(name = "班级有效期结束时间")
+	@ApiModelProperty("班级有效期结束时间")
+	private Long classEndTime;
+	/** 考期 */
+	@Excel(name = "考期")
+	@ApiModelProperty("考期")
+	private Long examineId;
+	/** 报考地区 */
+	@Excel(name = "报考地区")
+	@ApiModelProperty("报考地区")
+	private Long areasId;
+	/** 班主任ID */
+	@Excel(name = "班主任ID")
+	@ApiModelProperty("班主任ID")
+	private Long sysUserId;
+
+	/** 官方信息推送接口 */
+	@Excel(name = "官方信息推送接口")
+	@ApiModelProperty("官方信息推送接口")
+	private Long interfacePushId;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 官方账号开通 */
+	@Excel(name = "官方账号开通")
+	@ApiModelProperty("官方账号开通")
+	private Long interfaceAccountId;
+	/** 学时推送 */
+	@Excel(name = "学时推送")
+	@ApiModelProperty("学时推送")
+	private Long interfacePeriodId;
+}

+ 15 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeGoodsMapper.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.grade.mapper.ClassGradeGoodsMapper">
+
+    <resultMap type="com.zhongzheng.modules.grade.domain.ClassGradeGoods" id="ClassGradeGoodsResult">
+        <result property="gradeId" column="grade_id"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

+ 18 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeInterfaceMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.grade.mapper.ClassGradeInterfaceMapper">
+
+    <resultMap type="com.zhongzheng.modules.grade.domain.ClassGradeInterface" id="ClassGradeInterfaceResult">
+        <result property="id" column="id"/>
+        <result property="type" column="type"/>
+        <result property="name" column="name"/>
+        <result property="remark" column="remark"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

+ 30 - 0
zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -0,0 +1,30 @@
+<?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.grade.mapper.ClassGradeMapper">
+
+    <resultMap type="com.zhongzheng.modules.grade.domain.ClassGrade" id="ClassGradeResult">
+        <result property="classId" column="class_id"/>
+        <result property="classStatus" column="class_status"/>
+        <result property="officialName" column="official_name"/>
+        <result property="className" column="class_name"/>
+        <result property="studentUpper" column="student_upper"/>
+        <result property="learningTimeStart" column="learning_time_start"/>
+        <result property="learningStatus" column="learning_status"/>
+        <result property="status" column="status"/>
+        <result property="classStartTime" column="class_start_time"/>
+        <result property="classEndTime" column="class_end_time"/>
+        <result property="examineId" column="examine_id"/>
+        <result property="areasId" column="areas_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="sysUserId" column="sys_user_id"/>
+        <result property="interfacePushId" column="interface_push_id"/>
+        <result property="remark" column="remark"/>
+        <result property="interfaceAccountId" column="interface_account_id"/>
+        <result property="interfacePeriodId" column="interface_period_id"/>
+    </resultMap>
+
+
+</mapper>