通知管理

sapi/src/main/java/com/xhkjedu/sapi/mapper/notice/NoticeFileMapper.java

@@ -14,4 +14,7 @@ import java.util.List;
 public interface NoticeFileMapper extends TkMapper<TNoticeFile> {
     //通知附件列表
     List<TNoticeFile> listByNoticeId(@Param("noticeid") Integer noticeid);
+
+    //删除通知附件
+    void deleteByNoticeId(@Param("noticeid") Integer noticeid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/notice/NoticeUserMapper.java

@@ -30,4 +30,7 @@ public interface NoticeUserMapper extends TkMapper<TNoticeUser> {
 
     //通知对象
     List<Map> listByNoticeId(@Param("noticeid") Integer noticeid);
+
+    //删除通知对象
+    void deleteByNoticeId(@Param("noticeid") Integer noticeid);
 }

sapi/src/main/java/com/xhkjedu/sapi/model/notice/TNoticeUser.java

@@ -36,7 +36,4 @@ public class TNoticeUser extends BaseBean {
 
     //创建时间
     private Integer createtime;
-
-    //学校id
-    private Integer schoolid;
 }

sapi/src/main/java/com/xhkjedu/sapi/service/notice/NoticeService.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.sapi.service.notice;
 
+import com.xhkjedu.sapi.listener.MessageSender;
 import com.xhkjedu.sapi.mapper.notice.NoticeClassMapper;
 import com.xhkjedu.sapi.mapper.notice.NoticeMapper;
 import com.xhkjedu.sapi.mapper.notice.NoticeUserMapper;
@@ -11,9 +12,11 @@ import com.xhkjedu.sapi.model.notice.TNotice;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author ywx
@@ -31,8 +34,11 @@ public class NoticeService {
     private NoticeUserMapper noticeUserMapper;
     @Resource
     private NoticeFileMapper noticeFileMapper;
+    @Resource
+    private MessageSender messageSender;
 
     //添加
+    @Transactional(rollbackFor = Exception.class)
     public Integer save(TNotice model) {
         if (N_Utils.isEmptyInteger(model.getCreatetime())) {
             model.setCreatetime(N_Utils.getSecondTimestamp());
@@ -42,7 +48,19 @@ public class NoticeService {
         //添加通知对象
         saveNoticeObj(model);
 
-        //通知附件
+        //添加通知附件
+        saveFile(model);
+        return model.getId();
+    }
+
+    /**
+     * @Description 添加通知附件
+     * @Date 2023/12/20 9:33
+     * @Author YWX
+     * @Param [model]
+     * @Return void
+     **/
+    private void saveFile(TNotice model) {
         List<TNoticeFile> files = model.getFiles();
         if (N_Utils.isListNotEmpty(files)) {
             Integer noticeid = model.getNoticeid();
@@ -51,17 +69,59 @@ public class NoticeService {
             }
             noticeFileMapper.insertList(files);
         }
-        return model.getId();
     }
 
     //删除
-    public Integer deleteById(Integer noticeid) {
-        return noticeMapper.deleteByPrimaryKey(noticeid);
+    public void deleteById(Integer noticeid) {
+        List<TNoticeFile> files = noticeFileMapper.listByNoticeId(noticeid);
+        noticeMapper.deleteByPrimaryKey(noticeid);
+        resourceDel(files);
+    }
+
+    /**
+     * @Description 删除服务器文件
+     * @Date 2023/12/20 9:48
+     * @Author YWX
+     * @Param [files]
+     * @Return void
+     **/
+    private void resourceDel(List<TNoticeFile> files) {
+        if (N_Utils.isListNotEmpty(files)) {
+            List<String> resourceUrls = new ArrayList<>();
+            for (TNoticeFile file : files) {
+                resourceUrls.add(file.getResourceurl());
+                String resourcecover = file.getResourcecover();
+                if (N_Utils.isNotEmpty(resourcecover)) resourceUrls.add(resourcecover);
+                String pdfurl = file.getPdfurl();
+                if (N_Utils.isNotEmpty(pdfurl)) resourceUrls.add(pdfurl);
+            }
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
     }
 
     //修改
-    public Integer update(TNotice model) {
-        return noticeMapper.updateByPrimaryKeySelective(model);
+    @Transactional(rollbackFor = Exception.class)
+    public void update(TNotice model) {
+        noticeMapper.updateByPrimaryKeySelective(model);
+        Integer noticeid = model.getNoticeid();
+        //添加通知对象
+        noticeUserMapper.deleteByNoticeId(noticeid);//删除通知对象
+        saveNoticeObj(model);//重新添加
+
+        //添加通知附件
+        List<TNoticeFile> oldFiles = noticeFileMapper.listByNoticeId(noticeid);
+        noticeFileMapper.deleteByNoticeId(noticeid);//删除通知附件
+        saveFile(model);//重新添加
+        //删除的文件从服务器删除
+        List<TNoticeFile> delFiles = new ArrayList<>();
+        List<String> resourceurls = model.getFiles().stream().map(TNoticeFile::getResourceurl).collect(Collectors.toList());
+        for (TNoticeFile oldFile : oldFiles) {
+            String resourceurl = oldFile.getResourceurl();
+            if(!resourceurls.contains(resourceurl)){
+                delFiles.add(oldFile);
+            }
+        }
+        resourceDel(delFiles);
     }
 
     //添加通知对象

sapi/src/main/resources/mapper/notice/NoticeFileMapper.xml

@@ -5,4 +5,8 @@
     <select id="listByNoticeId" resultType="com.xhkjedu.sapi.model.notice.TNoticeFile">
         select * from t_notice_file where noticeid=#{noticeid}
     </select>
+    <!--删除通知附件-->
+    <delete id="deleteByNoticeId">
+        delete from t_notice_file where noticeid=#{noticeid}
+    </delete>
 </mapper>

sapi/src/main/resources/mapper/notice/NoticeMapper.xml

@@ -61,7 +61,7 @@
     </select>
     <!-- 用户通知列表 -->
     <select id="listMy" resultType="com.xhkjedu.sapi.vo.notice.NoticeVo">
-        select n.noticeid,n.noticetitle,n.createtime,u.username createname,IFNULL(nt.readed,0) as readed
+        select n.noticeid,n.noticetitle,n.noticetxt,n.createtime,u.username createname,IFNULL(nt.readed,0) as readed
         from t_notice n left join t_user u on n.createid=u.userid
         left join t_notice_user nt on n.noticeid = nt.noticeid
         where nt.userid=#{notice.createid}

sapi/src/main/resources/mapper/notice/NoticeUserMapper.xml

@@ -3,10 +3,10 @@
 <mapper namespace="com.xhkjedu.sapi.mapper.notice.NoticeUserMapper">
     <!--批量添加-->
     <insert id="batchSave" parameterType="com.xhkjedu.sapi.model.notice.TNotice">
-        INSERT INTO t_notice_user (noticeid,userid,createtime,schoolid,gradeid,classid,subjectid)
+        INSERT INTO t_notice_user (noticeid,userid,createtime,gradeid,classid,subjectid)
         VALUES
         <foreach collection ="notice.users" item="t" index= "index" separator =",">
-            (#{notice.noticeid},#{t.userid},#{notice.createtime},#{notice.schoolid}
+            (#{notice.noticeid},#{t.userid},#{notice.createtime}
             ,#{t.gradeid},#{t.classid},#{t.subjectid})
         </foreach>
     </insert>
@@ -15,6 +15,10 @@
         update t_notice_user nt set nt.readed=1,nt.readtime=#{timestamp}
         where nt.noticeid=#{noticeid} and nt.userid=#{userid}
     </update>
+    <!--删除通知对象-->
+    <delete id="deleteByNoticeId">
+        delete from t_notice_user where noticeid=#{noticeid}
+    </delete>
     <!--通知对象-->
     <resultMap id="userResult" type="java.util.Map">
         <result property="gradeid" column="gradeid"/>

sexam/src/main/java/com/xhkjedu/sexam/mapper/notice/NoticeClassMapper.java

@@ -1,7 +0,0 @@
-package com.xhkjedu.sexam.mapper.notice;
-
-import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sexam.model.notice.TNoticeClass;
-
-public interface NoticeClassMapper extends TkMapper<TNoticeClass> {
-}

sexam/src/main/java/com/xhkjedu/sexam/mapper/notice/NoticeSchoolMapper.java

@@ -1,7 +0,0 @@
-package com.xhkjedu.sexam.mapper.notice;
-
-import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sexam.model.notice.TNoticeSchool;
-
-public interface NoticeSchoolMapper extends TkMapper<TNoticeSchool> {
-}

sexam/src/main/java/com/xhkjedu/sexam/model/notice/TNotice.java

@@ -38,10 +38,6 @@ public class TNotice extends BaseBean {
     //通知内容纯文本
     private String noticetxt;
 
-    @Transient
-    //班级id集合
-    private List<TNoticeClass> classes = new ArrayList<>();
-
     @Transient
     //教师id集合
     private List<TNoticeUser> users = new ArrayList<>();

sexam/src/main/java/com/xhkjedu/sexam/model/notice/TNoticeClass.java

@@ -1,27 +0,0 @@
-package com.xhkjedu.sexam.model.notice;
-
-import com.xhkjedu.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Table(name = "t_notice_class")
-@Data
-public class TNoticeClass extends BaseBean {
-    @Id
-    //通知班级表
-    private Integer ncid;
-
-    //通知id
-    private Integer noticeid;
-
-    //班级id
-    private Integer classid;
-
-    //创建时间
-    private Integer createid;
-
-    //创建时间
-    private Integer createtime;
-}

sexam/src/main/java/com/xhkjedu/sexam/model/notice/TNoticeSchool.java

@@ -1,27 +0,0 @@
-package com.xhkjedu.sexam.model.notice;
-
-import com.xhkjedu.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Table(name = "t_notice_school")
-@Data
-public class TNoticeSchool extends BaseBean {
-    @Id
-    //通知公告学校关联关系表
-    private Integer nsid;
-
-    //通知id
-    private Integer noticeid;
-
-    //学校id
-    private Integer schoolid;
-
-    //创建时间
-    private Integer createid;
-
-    //创建时间
-    private Integer createtime;
-}

sexam/src/main/java/com/xhkjedu/sexam/model/notice/TNoticeUser.java

@@ -36,7 +36,4 @@ public class TNoticeUser extends BaseBean {
 
     //创建时间
     private Integer createtime;
-
-    //学校id
-    private Integer schoolid;
 }

sexam/src/main/java/com/xhkjedu/sexam/service/notice/NoticeService.java

@@ -65,7 +65,6 @@ public class NoticeService {
                         t.setNoticeid(noticeid);
                         t.setReaded(0);
                         t.setCreatetime(createtime);
-                        t.setSchoolid(schoolid);
                     });
                     teacherList.addAll(teachers);
                 });
@@ -217,7 +216,6 @@ public class NoticeService {
                         t.setNoticeid(noticeid);
                         t.setReaded(0);
                         t.setCreatetime(createtime);
-                        t.setSchoolid(schoolid);
                     });
                     nteacherList.addAll(cteachers);
                 });

sexam/src/main/resources/mapper/notice/NoticeMapper.xml

@@ -1,4 +0,0 @@
-<?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.xhkjedu.sexam.mapper.notice.NoticeMapper">
-</mapper>

sexam/src/main/resources/mapper/notice/NoticeUserMapper.xml

@@ -1,4 +0,0 @@
-<?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.xhkjedu.sexam.mapper.notice.NoticeUserMapper">
-</mapper>

slive/src/main/java/com/xhkjedu/slive/mapper/notice/NoticeClassMapper.java

@@ -1,17 +0,0 @@
-package com.xhkjedu.slive.mapper.notice;
-
-import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slive.model.notice.TNotice;
-import com.xhkjedu.slive.model.notice.TNoticeClass;
-import org.apache.ibatis.annotations.Param;
-
-public interface NoticeClassMapper extends TkMapper<TNoticeClass> {
-    /**
-     * 批量添加
-     * @Param [notice]
-     * @Author ywx
-     * @Date 2020/6/13 10:01
-     * @return java.lang.Integer
-     **/
-    Integer batchSave(@Param("notice") TNotice notice);
-}

slive/src/main/java/com/xhkjedu/slive/mapper/notice/NoticeMapper.java

@@ -1,7 +0,0 @@
-package com.xhkjedu.slive.mapper.notice;
-
-import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slive.model.notice.TNotice;
-
-public interface NoticeMapper extends TkMapper<TNotice> {
-}

slive/src/main/java/com/xhkjedu/slive/mapper/notice/NoticeSchoolMapper.java

@@ -1,11 +0,0 @@
-package com.xhkjedu.slive.mapper.notice;
-
-import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.slive.model.notice.TNotice;
-import com.xhkjedu.slive.model.notice.TNoticeSchool;
-import org.apache.ibatis.annotations.Param;
-
-public interface NoticeSchoolMapper extends TkMapper<TNoticeSchool> {
-    //批量添加
-    void batchSave(@Param("notice") TNotice notice);
-}

slive/src/main/java/com/xhkjedu/slive/model/notice/TNotice.java

@@ -1,63 +0,0 @@
-package com.xhkjedu.slive.model.notice;
-
-import com.xhkjedu.model.BaseBean;
-import com.xhkjedu.slive.model.gradeclass.TSchool;
-import com.xhkjedu.slive.vo.gradeclass.ClassVo;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import java.util.List;
-
-@Table(name = "t_notice")
-@Data
-public class TNotice extends BaseBean {
-    @Id
-    //通知表
-    private Integer noticeid;
-
-    //通知标题
-    private String noticetitle;
-
-    //通知对象1班级2老师3学校师生4学校教师5学校学生
-    private Integer noticetype;
-
-    //创建人
-    private Integer createid;
-
-    //创建时间
-    private Integer createtime;
-
-    //学校id
-    private Integer schoolid;
-
-    //通知内容
-    private String noticecontent;
-
-    //通知内容纯文本
-    private String noticetxt;
-
-    @Transient
-    //班级id集合
-    private List<ClassVo> classes;
-
-    //@Transient
-    ////教师id集合
-    //private List<NoticeTeacherVo> teachers;
-
-    @Transient
-    //开始时间
-    private Integer starttime;
-
-    @Transient
-    //结束时间
-    private Integer stoptime;
-
-    @Transient
-    private Integer readed;//是否查看0未查看1已查看
-
-    @Transient
-    //学校id集合
-    private List<TSchool> schools;
-}

slive/src/main/java/com/xhkjedu/slive/model/notice/TNoticeClass.java

@@ -1,27 +0,0 @@
-package com.xhkjedu.slive.model.notice;
-
-import com.xhkjedu.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Table(name = "t_notice_class")
-@Data
-public class TNoticeClass extends BaseBean {
-    @Id
-    //通知班级表
-    private Integer ncid;
-
-    //通知id
-    private Integer noticeid;
-
-    //班级id
-    private Integer classid;
-
-    //创建时间
-    private Integer createid;
-
-    //创建时间
-    private Integer createtime;
-}

slive/src/main/java/com/xhkjedu/slive/model/notice/TNoticeSchool.java

@@ -1,27 +0,0 @@
-package com.xhkjedu.slive.model.notice;
-
-import com.xhkjedu.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Table(name = "t_notice_school")
-@Data
-public class TNoticeSchool extends BaseBean {
-    @Id
-    //通知公告学校关联关系表
-    private Integer nsid;
-
-    //通知id
-    private Integer noticeid;
-
-    //学校id
-    private Integer schoolid;
-
-    //创建时间
-    private Integer createid;
-
-    //创建时间
-    private Integer createtime;
-}

slive/src/main/java/com/xhkjedu/slive/service/notice/NoticeService.java

@@ -1,58 +0,0 @@
-package com.xhkjedu.slive.service.notice;
-
-import com.xhkjedu.slive.mapper.notice.NoticeClassMapper;
-import com.xhkjedu.slive.mapper.notice.NoticeMapper;
-import com.xhkjedu.slive.mapper.notice.NoticeSchoolMapper;
-import com.xhkjedu.slive.model.gradeclass.TSchool;
-import com.xhkjedu.slive.model.notice.TNotice;
-import com.xhkjedu.utils.N_Utils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author ywx
- * @classname NoticeService
- * @description 
- * @date 2020/6/12 17:55
- **/
-@Service
-public class NoticeService {
-    @Resource
-    private NoticeMapper noticeMapper;
-    @Resource
-    private NoticeClassMapper noticeClassMapper;
-    @Resource
-    private NoticeSchoolMapper noticeSchoolMapper;
-
-    //添加
-    public Integer save(TNotice model) {
-        if (N_Utils.isEmptyInteger(model.getCreatetime())) {
-            model.setCreatetime(N_Utils.getSecondTimestamp());
-        }
-        noticeMapper.insertUseGeneratedKeys(model);
-        model.setNoticeid(model.getId());
-        //添加通知对象
-        saveNoticeObj(model);
-
-        return model.getId();
-    }
-
-    //添加通知对象
-    private void saveNoticeObj(TNotice model) {
-        if (model.getNoticetype() == 1) {//通知对象1班级
-            noticeClassMapper.batchSave(model);
-        }
-
-        if (N_Utils.isListEmpty(model.getSchools())) {//兼容以前添加单个学校模式
-            List<TSchool> schools = new ArrayList<>();
-            TSchool s = new TSchool();
-            s.setSchoolid(model.getSchoolid());
-            schools.add(s);
-            model.setSchools(schools);
-        }
-        noticeSchoolMapper.batchSave(model);//通知学校关联信息
-    }
-}

slive/src/main/resources/mapper/notice/NoticeClassMapper.xml

@@ -1,12 +0,0 @@
-<?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.xhkjedu.slive.mapper.notice.NoticeClassMapper">
-    <!--批量添加-->
-    <insert id="batchSave" parameterType="com.xhkjedu.slive.model.notice.TNotice">
-        INSERT INTO t_notice_class (noticeid,classid,createid,createtime)
-        VALUES
-        <foreach collection ="notice.classes" item="c" index= "index" separator =",">
-            (#{notice.noticeid},#{c.classid},#{notice.createid},#{notice.createtime})
-        </foreach>
-    </insert>
-</mapper>

slive/src/main/resources/mapper/notice/NoticeSchoolMapper.xml

@@ -1,12 +0,0 @@
-<?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.xhkjedu.slive.mapper.notice.NoticeSchoolMapper">
-    <!--批量添加-->
-    <insert id="batchSave" parameterType="com.xhkjedu.slive.model.notice.TNotice">
-        INSERT INTO t_notice_school (noticeid,schoolid,createid,createtime)
-        VALUES
-        <foreach collection ="notice.schools" item="school" index= "index" separator =",">
-            (#{notice.noticeid},#{school.schoolid},#{notice.createid},#{notice.createtime})
-        </foreach>
-    </insert>
-</mapper>

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/system/NoticeClassMapper.java

@@ -1,8 +0,0 @@
-package com.xhkjedu.sstudy.mapper.system;
-
-import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sstudy.model.system.TNoticeClass;
-
-public interface NoticeClassMapper extends TkMapper<TNoticeClass> {
-
-}

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/system/NoticeUserMapper.java

@@ -0,0 +1,8 @@
+package com.xhkjedu.sstudy.mapper.system;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.sstudy.model.system.TNoticeUser;
+
+public interface NoticeUserMapper extends TkMapper<TNoticeUser> {
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/model/system/TNoticeClass.java

@@ -1,31 +0,0 @@
-package com.xhkjedu.sstudy.model.system;
-
-import com.xhkjedu.model.BaseBean;
-import lombok.Data;
-
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/*
-* @Description 班级通知，学生个人通知
-* @Author WN
-*/
-@Table(name = "t_notice_class")
-@Data
-public class TNoticeClass extends BaseBean {
-    @Id
-    //通知班级表
-    private Integer ncid;
-
-    //通知id
-    private Integer noticeid;
-
-    //班级id
-    private Integer classid;
-
-    //创建时间
-    private Integer createid;
-
-    //创建时间
-    private Integer createtime;
-}

sstudy/src/main/java/com/xhkjedu/sstudy/model/system/TNoticeUser.java

@@ -0,0 +1,39 @@
+package com.xhkjedu.sstudy.model.system;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_notice_user")
+@Data
+public class TNoticeUser extends BaseBean {
+    @Id
+    //通知用户表
+    private Integer nuid;
+
+    //通知id
+    private Integer noticeid;
+
+    //用户id
+    private Integer userid;
+
+    //是否查看0未查看1已查看
+    private Integer readed;
+
+    //查看时间
+    private Integer readtime;
+
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
+
+    //创建时间
+    private Integer createtime;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/service/system/NoticeService.java

@@ -1,11 +1,12 @@
 package com.xhkjedu.sstudy.service.system;
 
-import com.xhkjedu.sstudy.mapper.system.NoticeClassMapper;
+import com.xhkjedu.sstudy.mapper.gradeclass.ClassMapper;
+import com.xhkjedu.sstudy.mapper.system.NoticeUserMapper;
 import com.xhkjedu.sstudy.mapper.system.NoticeMapper;
 import com.xhkjedu.sstudy.mapper.system.SchoolMapper;
+import com.xhkjedu.sstudy.model.gradeclass.TClass;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudentBack;
-import com.xhkjedu.sstudy.model.system.TNotice;
-import com.xhkjedu.sstudy.model.system.TNoticeClass;
+import com.xhkjedu.sstudy.model.system.*;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -24,9 +25,11 @@ public class NoticeService {
     @Resource
     private NoticeMapper noticeMapper;
     @Resource
-    private NoticeClassMapper noticeClassMapper;
+    private NoticeUserMapper noticeUserMapper;
     @Resource
     private SchoolMapper schoolMapper;
+    @Resource
+    private ClassMapper classMapper;
 
     @Async("asyncPoolTaskExecutor")
     public void save(Map map, TPaperStudentBack psb){
@@ -58,11 +61,14 @@ public class NoticeService {
         notice.setSchoolid(schoolid);
         noticeMapper.insertUseGeneratedKeys(notice);
         //保存学生通知内容
-        TNoticeClass noticeClass = new TNoticeClass();
-        noticeClass.setNoticeid(notice.getId());
-        noticeClass.setClassid(Integer.parseInt(map.get("studentid").toString()));
-        noticeClass.setCreateid(psb.getCreateid());
-        noticeClass.setCreatetime(psb.getCreatetime());
-        noticeClassMapper.insertUseGeneratedKeys(noticeClass);
+        TNoticeUser nu = new TNoticeUser();
+        nu.setNoticeid(notice.getId());
+        nu.setUserid(Integer.parseInt(map.get("studentid").toString()));
+        Integer classid = N_Utils.str2Int(map.get("classid").toString());
+        TClass tClass = classMapper.selectByPrimaryKey(classid);
+        nu.setGradeid(tClass.getGradeid());
+        nu.setClassid(classid);
+        nu.setCreatetime(psb.getCreatetime());
+        noticeUserMapper.insertUseGeneratedKeys(nu);
     }
 }

suser/src/main/resources/mapper/gradeclass/ClassTeacherMapper.xml

@@ -228,10 +228,10 @@
         left join t_user u on cs.studentid=u.userid
         where ct.teacherid=#{role.teacherid} and c.year=#{role.year} and c.classstate=1
         and c.schoolid=#{role.schoolid} and c.classnum>0
-        <if test="classtype!=null and classtype!=0">
-            and c.classtype=#{classtype}
+        <if test="role.classtype!=null and role.classtype!=0">
+            and c.classtype=#{role.classtype}
         </if>
-        <if test="classtype==null or classtype==0">
+        <if test="role.classtype==null or role.classtype==0">
             and c.classtype <![CDATA[ < ]]>5
         </if>
         order by c.gradeid,c.classtype,c.classorder,c.classname,convert(u.username using gbk)