通知列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformController.java

@@ -3,6 +3,10 @@ package com.zhongzheng.controller.inform;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
+import com.zhongzheng.modules.grade.service.IClassGradeService;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserListVo;
+import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.inform.bo.InformUserQueryBo;
 import com.zhongzheng.modules.inform.service.IInformUserService;
 import com.zhongzheng.modules.inform.vo.InformUserVo;
@@ -45,6 +49,8 @@ public class InformController extends BaseController {
 
     private final IInformService iInformService;
 
+    private final IClassGradeService iClassGradeService;
+
     private final IInformUserService iInformUserService;
 
     /**
@@ -92,6 +98,30 @@ public class InformController extends BaseController {
         return toAjax(iInformService.insertByAddBo(bo) ? 1 : 0);
     }
 
+    /**
+     * 查询班级列表
+     */
+    @ApiOperation("查询班级列表下的学员")
+    @PreAuthorize("@ss.hasPermi('system:grade:list')")
+    @GetMapping("/listGrade")
+    public TableDataInfo<ClassGradeUserListVo> listGradeInform(ClassGradeQueryBo bo) {
+        startPage();
+        List<ClassGradeUserListVo> list = iClassGradeService.listGradeInform(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 有多少学员无该课程或题库
+     */
+    @ApiOperation("有多少学员无该课程或题库")
+    @PreAuthorize("@ss.hasPermi('grade:grade:select')")
+    @GetMapping("/selectNum")
+    public AjaxResult<Integer> selectNum(InformAddBo bo) {
+        Integer Num = iInformService.selectNum(bo);
+
+        return AjaxResult.success(Num);
+    }
+
     /**
      * 修改【通知】
      */

zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformRemindController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.inform;
+
+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.inform.vo.InformRemindVo;
+import com.zhongzheng.modules.inform.bo.InformRemindQueryBo;
+import com.zhongzheng.modules.inform.bo.InformRemindAddBo;
+import com.zhongzheng.modules.inform.bo.InformRemindEditBo;
+import com.zhongzheng.modules.inform.service.IInformRemindService;
+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-25
+ */
+@Api(value = "提醒设置控制器", tags = {"提醒设置管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/remind")
+public class InformRemindController extends BaseController {
+
+    private final IInformRemindService iInformRemindService;
+
+    /**
+     * 查询提醒设置列表
+     */
+    @ApiOperation("查询提醒设置列表")
+    @PreAuthorize("@ss.hasPermi('system:remind:list')")
+    @GetMapping("/list")
+    public TableDataInfo<InformRemindVo> list(InformRemindQueryBo bo) {
+        startPage();
+        List<InformRemindVo> list = iInformRemindService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出提醒设置列表
+     */
+    @ApiOperation("导出提醒设置列表")
+    @PreAuthorize("@ss.hasPermi('system:remind:export')")
+    @Log(title = "提醒设置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<InformRemindVo> export(InformRemindQueryBo bo) {
+        List<InformRemindVo> list = iInformRemindService.queryList(bo);
+        ExcelUtil<InformRemindVo> util = new ExcelUtil<InformRemindVo>(InformRemindVo.class);
+        return util.exportExcel(list, "提醒设置");
+    }
+
+    /**
+     * 获取提醒设置详细信息
+     */
+    @ApiOperation("获取提醒设置详细信息")
+    @PreAuthorize("@ss.hasPermi('system:remind:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<InformRemindVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iInformRemindService.queryById(id));
+    }
+
+    /**
+     * 新增提醒设置
+     */
+    @ApiOperation("新增提醒设置")
+    @PreAuthorize("@ss.hasPermi('system:remind:add')")
+    @Log(title = "提醒设置", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody InformRemindAddBo bo) {
+        return toAjax(iInformRemindService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改提醒设置
+     */
+    @ApiOperation("修改提醒设置")
+    @PreAuthorize("@ss.hasPermi('system:remind:edit')")
+    @Log(title = "提醒设置", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody InformRemindEditBo bo) {
+        return toAjax(iInformRemindService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除提醒设置
+     */
+    @ApiOperation("删除提醒设置")
+    @PreAuthorize("@ss.hasPermi('system:remind:remove')")
+    @Log(title = "提醒设置" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iInformRemindService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

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

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserListVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 
 import java.util.Collection;
@@ -25,4 +26,6 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
 
 
     List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo);
+
+    List<ClassGradeUserListVo> listGradeInform(ClassGradeQueryBo bo);
 }

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

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.grade.service;
 import com.zhongzheng.modules.grade.bo.*;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserListVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -52,4 +53,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
     List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo);
 
     boolean editUserGrade(ClassGradeUserAddQueryBo bo);
+
+	List<ClassGradeUserListVo> listGradeInform(ClassGradeQueryBo bo);
 }

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

@@ -16,6 +16,7 @@ import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
 import com.zhongzheng.modules.grade.service.IClassGradeSysService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
+import com.zhongzheng.modules.grade.vo.ClassGradeUserListVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserVo;
 import com.zhongzheng.modules.system.domain.SysConfig;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
@@ -242,4 +243,15 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
 
         return true;
     }
+
+    @Override
+    public List<ClassGradeUserListVo> listGradeInform(ClassGradeQueryBo bo) {
+        List<ClassGradeUserListVo> classGradeVos = baseMapper.listGradeInform(bo);
+        for (ClassGradeUserListVo classGradeVo : classGradeVos) {
+            ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
+            classGradeUserQueryBo.setGradeId(classGradeVo.getGradeId());
+            classGradeVo.setClassGradeStudentVos(listGrade(classGradeUserQueryBo));
+        }
+        return classGradeVos;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserListVo.java

@@ -0,0 +1,133 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 班级视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("班级视图对象")
+public class ClassGradeUserListVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long gradeId;
+
+	/** 开班状态 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;
+
+	/** 班级关联商品 */
+	@Excel(name = "班级关联商品")
+	@ApiModelProperty("班级关联商品")
+	private List<GoodsVo> goodsList;
+
+	/** 用户昵称 */
+	@Excel(name = "用户名称")
+	@ApiModelProperty("用户名称")
+	private String nickName;
+
+	/** 官方账号开通名字 */
+	@Excel(name = "官方账号开通名字")
+	@ApiModelProperty("官方账号开通名字")
+	private String interfaceAccountName;
+	/** 学时推送名字 */
+	@Excel(name = "学时推送名字")
+	@ApiModelProperty("学时推送名字")
+	private String interfacePeriodName;
+
+	/** 官方信息推送接口名字 */
+	@Excel(name = "官方信息推送接口名字")
+	@ApiModelProperty("官方信息推送接口名字")
+	private String interfacePushName;
+
+	/** 报考地区 */
+	@ApiModelProperty("报考地区")
+	private Long cityId;
+
+	/** 班級編碼 */
+	@ApiModelProperty("班級編碼")
+	private String gradeCode;
+
+	/** 学员人数 */
+	@ApiModelProperty("学员人数")
+	private Integer studentNum;
+
+	@ApiModelProperty("学员列表")
+	private List<ClassGradeStudentVo> classGradeStudentVos;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformAddBo.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -57,11 +57,11 @@ public class InformAddBo {
 
     /** 添加题库 */
     @ApiModelProperty("添加课程节")
-    private InformCourseAddBo informCourseAddBo;
+    private List<InformCourseAddBo> informCourseAddBo;
 
     /** 添加试卷 */
     @ApiModelProperty("添加试卷")
-    private InformExamAddBo informExamAddBo;
+    private List<InformExamAddBo> informExamAddBo;
 
     /** 用户id */
     @ApiModelProperty("用户id")

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformRemindAddBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.inform.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 提醒设置添加对象 inform_remind
+ *
+ * @author ruoyi
+ * @date 2021-11-25
+ */
+@Data
+@ApiModel("提醒设置添加对象")
+public class InformRemindAddBo {
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+    /** 触发规则 */
+    @ApiModelProperty("触发规则")
+    private String logic;
+    /** 短信启用状态 1启用 0未启用 */
+    @ApiModelProperty("短信启用状态 1启用 0未启用")
+    private Integer noteStatus;
+    /** 站内信 1启用 0未启用 */
+    @ApiModelProperty("站内信 1启用 0未启用")
+    private Integer wayStatus;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformRemindEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.inform.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 提醒设置编辑对象 inform_remind
+ *
+ * @author ruoyi
+ * @date 2021-11-25
+ */
+@Data
+@ApiModel("提醒设置编辑对象")
+public class InformRemindEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 排序 */
+    @ApiModelProperty("排序")
+    private Long sort;
+
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+
+    /** 触发规则 */
+    @ApiModelProperty("触发规则")
+    private String logic;
+
+    /** 短信启用状态 1启用 0未启用 */
+    @ApiModelProperty("短信启用状态 1启用 0未启用")
+    private Integer noteStatus;
+
+    /** 站内信 1启用 0未启用 */
+    @ApiModelProperty("站内信 1启用 0未启用")
+    private Integer wayStatus;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformRemindQueryBo.java

@@ -0,0 +1,54 @@
+package com.zhongzheng.modules.inform.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;
+
+/**
+ * 提醒设置分页查询对象 inform_remind
+ *
+ * @author ruoyi
+ * @date 2021-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("提醒设置分页查询对象")
+public class InformRemindQueryBo 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 sort;
+	/** 提醒项 */
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 触发规则 */
+	@ApiModelProperty("触发规则")
+	private String logic;
+	/** 短信启用状态 1启用 0未启用 */
+	@ApiModelProperty("短信启用状态 1启用 0未启用")
+	private Integer noteStatus;
+	/** 站内信 1启用 0未启用 */
+	@ApiModelProperty("站内信 1启用 0未启用")
+	private Integer wayStatus;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformRemind.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.inform.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;
+
+/**
+ * 提醒设置对象 inform_remind
+ *
+ * @author ruoyi
+ * @date 2021-11-25
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("inform_remind")
+public class InformRemind implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 排序 */
+    private Long sort;
+    /** 提醒项 */
+    private String remind;
+    /** 触发规则 */
+    private String logic;
+    /** 短信启用状态 1启用 0未启用 */
+    private Integer noteStatus;
+    /** 站内信 1启用 0未启用 */
+    private Integer wayStatus;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/mapper/InformMapper.java

@@ -4,6 +4,7 @@ import com.zhongzheng.modules.inform.bo.InformQueryBo;
 import com.zhongzheng.modules.inform.domain.Inform;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.inform.vo.InformVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +17,6 @@ import java.util.List;
 public interface InformMapper extends BaseMapper<Inform> {
 
     List<InformVo> listInform(InformQueryBo bo);
+
+    Integer selectOrder(@Param("goodsId") Long goodsId ,@Param("userId") Long userId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/mapper/InformRemindMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.inform.mapper;
+
+import com.zhongzheng.modules.inform.domain.InformRemind;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 提醒设置Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-11-25
+ */
+public interface InformRemindMapper extends BaseMapper<InformRemind> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformRemindService.java

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformService.java

@@ -51,4 +51,6 @@ public interface IInformService extends IService<Inform> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
 	List<InformVo> listInform(InformQueryBo bo);
+
+	Integer selectNum(InformAddBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformRemindServiceImpl.java

@@ -0,0 +1,103 @@
+package com.zhongzheng.modules.inform.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.inform.bo.InformRemindAddBo;
+import com.zhongzheng.modules.inform.bo.InformRemindQueryBo;
+import com.zhongzheng.modules.inform.bo.InformRemindEditBo;
+import com.zhongzheng.modules.inform.domain.InformRemind;
+import com.zhongzheng.modules.inform.mapper.InformRemindMapper;
+import com.zhongzheng.modules.inform.vo.InformRemindVo;
+import com.zhongzheng.modules.inform.service.IInformRemindService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 提醒设置Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-11-25
+ */
+@Service
+public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, InformRemind> implements IInformRemindService {
+
+    @Override
+    public InformRemindVo queryById(Long id){
+        InformRemind db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, InformRemindVo.class);
+    }
+
+    @Override
+    public List<InformRemindVo> queryList(InformRemindQueryBo bo) {
+        LambdaQueryWrapper<InformRemind> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSort() != null, InformRemind::getSort, bo.getSort());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemind()), InformRemind::getRemind, bo.getRemind());
+        lqw.eq(StrUtil.isNotBlank(bo.getLogic()), InformRemind::getLogic, bo.getLogic());
+        lqw.eq(bo.getNoteStatus() != null, InformRemind::getNoteStatus, bo.getNoteStatus());
+        lqw.eq(bo.getWayStatus() != null, InformRemind::getWayStatus, bo.getWayStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<InformRemindVo> entity2Vo(Collection<InformRemind> collection) {
+        List<InformRemindVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, InformRemindVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<InformRemind> page = (Page<InformRemind>)collection;
+            Page<InformRemindVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(InformRemindAddBo bo) {
+        InformRemind add = BeanUtil.toBean(bo, InformRemind.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(InformRemindEditBo bo) {
+        InformRemind update = BeanUtil.toBean(bo, InformRemind.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(InformRemind 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/inform/service/impl/InformServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.inform.bo.InformUserAddBo;
+import com.zhongzheng.modules.inform.bo.*;
 import com.zhongzheng.modules.inform.service.IInformCourseService;
 import com.zhongzheng.modules.inform.service.IInformExamService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
@@ -14,9 +14,6 @@ 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.inform.bo.InformAddBo;
-import com.zhongzheng.modules.inform.bo.InformQueryBo;
-import com.zhongzheng.modules.inform.bo.InformEditBo;
 import com.zhongzheng.modules.inform.domain.Inform;
 import com.zhongzheng.modules.inform.mapper.InformMapper;
 import com.zhongzheng.modules.inform.vo.InformVo;
@@ -96,10 +93,14 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
         add.setUpdateTime(DateUtils.getNowTime());
         add.setCreateBy(SecurityUtils.getUsername());
         boolean save = this.save(add);
-        bo.getInformCourseAddBo().setInformId(add.getInformId());
-        iInformCourseService.insertByAddBo(bo.getInformCourseAddBo());
-        bo.getInformExamAddBo().setInformId(add.getInformId());
-        iInformExamService.insertByAddBo(bo.getInformExamAddBo());
+        for (InformExamAddBo informExamAddBo : bo.getInformExamAddBo()) {
+            informExamAddBo.setInformId(add.getInformId());
+            iInformExamService.insertByAddBo(informExamAddBo);
+        }
+        for (InformCourseAddBo informCourseAddBo : bo.getInformCourseAddBo()) {
+            informCourseAddBo.setInformId(add.getInformId());
+            iInformCourseService.insertByAddBo(informCourseAddBo);
+        }
         for (Long userId : bo.getUserId()) {
             InformUserAddBo informUserAddBo = new InformUserAddBo();
             informUserAddBo.setInformId(add.getInformId());
@@ -145,4 +146,28 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
         }
         return informVos;
     }
+
+    @Override
+    public Integer selectNum(InformAddBo bo) {
+        Integer number = 0;
+        for (Long userId : bo.getUserId()) {
+            Integer num = 0;
+            for (InformExamAddBo informExamAddBo : bo.getInformExamAddBo()) {
+                Integer integer = baseMapper.selectOrder(informExamAddBo.getGoodsId(),userId);
+                if (integer >0){
+                    num++;
+                }
+            }
+            for (InformCourseAddBo informCourseAddBo : bo.getInformCourseAddBo()) {
+                Integer integer = baseMapper.selectOrder(informCourseAddBo.getGoodsId(),userId);
+                if (integer >0){
+                    num++;
+                }
+            }
+            if (num>0){
+                number++;
+            }
+        }
+        return number;
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformRemindVo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.inform.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-25
+ */
+@Data
+@ApiModel("提醒设置视图对象")
+public class InformRemindVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 排序 */
+	@Excel(name = "排序")
+	@ApiModelProperty("排序")
+	private Long sort;
+	/** 提醒项 */
+	@Excel(name = "提醒项")
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 触发规则 */
+	@Excel(name = "触发规则")
+	@ApiModelProperty("触发规则")
+	private String logic;
+	/** 短信启用状态 1启用 0未启用 */
+	@Excel(name = "短信启用状态 1启用 0未启用")
+	@ApiModelProperty("短信启用状态 1启用 0未启用")
+	private Integer noteStatus;
+	/** 站内信 1启用 0未启用 */
+	@Excel(name = "站内信 1启用 0未启用")
+	@ApiModelProperty("站内信 1启用 0未启用")
+	private Integer wayStatus;
+}

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

@@ -50,6 +50,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studentNum" column="student_num"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeUserListVo" id="ClassGradeUserListVo">
+        <result property="gradeId" column="grade_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="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"/>
+        <result property="interfaceAccountName" column="interface_account_name"/>
+        <result property="interfacePeriodName" column="interface_period_name"/>
+        <result property="interfacePushName" column="interface_push_name"/>
+        <result property="studentNum" column="student_num"/>
+    </resultMap>
+
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
         <result property="goodsId" column="goods_id"/>
@@ -117,6 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="recordNum" column="record_num"/>
     </resultMap>
 
+
+
     <select id="queryList" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeQueryBo" resultMap="ClassGradeVoResult">
         SELECT
             g.*,
@@ -272,5 +298,98 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by cgu.create_time desc
     </select>
 
-
+    <select id="listGradeInform" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeQueryBo" resultMap="ClassGradeUserListVo">
+        SELECT
+        g.*,
+        (SELECT name FROM class_grade_interface i where g.interface_push_id = i.id) as interface_push_name,
+        (SELECT name FROM class_grade_interface i where g.interface_account_id = i.id) as interface_account_name,
+        (SELECT name FROM class_grade_interface i where g.interface_period_id = i.id) as interface_period_name,
+        (SELECT nick_name FROM sys_user u where g.sys_user_id = u.user_id) as nick_name,
+        (SELECT area_name FROM apply_areas a where a.area_id = g.areas_id) as area_name,
+        (SELECT area_name FROM apply_areas a where a.area_id = g.city_id) as city_name,
+        (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = g.grade_id and a.status =1) as student_num
+        FROM
+        class_grade g
+        where 1=1
+        <if test="status != null and status.size()!=0 ">
+            AND g.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="gradeId != null and gradeId !=0 ">
+            AND g.grade_id =  #{gradeId}
+        </if>
+        <if test="className != null and className !='' ">
+            AND g.class_name like concat('%', #{className}, '%')
+        </if>
+        <if test="classStartTime != null and classStartTime !=0 ">
+            AND #{classStartTime} BETWEEN g.class_start_time and g.class_end_time or #{classEndTime} BETWEEN g.class_start_time and g.class_end_time
+        </if>
+        <if test="educationTypeId != null and educationTypeId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            LEFT JOIN goods d ON s.goods_id = d.goods_id
+            WHERE
+            1 = 1
+            AND g.grade_id = s.grade_id
+            AND d.education_type_id =#{educationTypeId}
+            ) >0
+        </if>
+        <if test="businessId != null and businessId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            LEFT JOIN goods d ON s.goods_id = d.goods_id
+            WHERE
+            1 = 1
+            AND g.grade_id = s.grade_id
+            AND d.business_id =#{businessId}
+            ) >0
+        </if>
+        <if test="schoolId != null and schoolId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            LEFT JOIN goods d ON s.goods_id = d.goods_id
+            WHERE
+            1 = 1
+            AND g.grade_id = s.grade_id
+            AND d.school_id =#{schoolId}
+            ) >0
+        </if>
+        <if test="majorId != null and majorId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            LEFT JOIN goods d ON s.goods_id = d.goods_id
+            WHERE
+            1 = 1
+            AND g.grade_id = s.grade_id
+            AND d.major_id =#{majorId}
+            ) >0
+        </if>
+        <if test="goodsId != null and goodsId !='' ">
+            AND (
+            SELECT
+            COUNT(*)
+            FROM
+            class_grade_goods s
+            WHERE
+            1 = 1
+            AND g.grade_id = s.grade_id
+            AND s.goods_id =#{goodsId}
+            ) >0
+        </if>
+        order by g.update_time desc
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/inform/InformMapper.xml

@@ -77,4 +77,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             IF((SELECT COUNT(iu.inform_id) FROM inform_user iu where i.inform_id=iu.inform_id and iu.send_status=1)<(SELECT COUNT(iu.inform_id) FROM inform_user iu where i.inform_id=iu.inform_id),3,4))) = #{userStatus}
         </if>
     </select>
+
+    <select id="selectOrder" parameterType="long"  resultType="integer">
+        SELECT
+            COUNT(og.order_sn)
+        FROM
+            `order` o
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+        WHERE
+            refund_status = 0
+          AND o.user_id =#{userId}
+          AND o.goods_id = #{goodsId}
+        and
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/inform/InformRemindMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.inform.mapper.InformRemindMapper">
+
+    <resultMap type="com.zhongzheng.modules.inform.domain.InformRemind" id="InformRemindResult">
+        <result property="id" column="id"/>
+        <result property="sort" column="sort"/>
+        <result property="remind" column="remind"/>
+        <result property="logic" column="logic"/>
+        <result property="noteStatus" column="note_status"/>
+        <result property="wayStatus" column="way_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>