Merge remote-tracking branch 'origin/ywx' into wn

# Conflicts:
#	sapi/src/main/java/com/xhkjedu/sapi/controller/notice/NoticeController.java
#	sapi/src/main/java/com/xhkjedu/sapi/service/notice/NoticeService.java

sapi/src/main/java/com/xhkjedu/sapi/controller/notice/NoticeController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author ywx
@@ -146,6 +147,14 @@ public class NoticeController {
         return new ResultVo(0,"获取学生通知列表成功",pageResult);
     }
 
+    @PostMapping("/list_user")
+    public ResultVo listUser(@RequestBody TNotice notice) {
+        Integer noticeid = notice.getNoticeid();
+        N_Utils.validation(new Object[]{noticeid, "通知id", 1});
+        List<Map> list = noticeService.listUser(noticeid);
+        return new ResultVo(0, "获取通知对象成功", list);
+    }
+
     /*
      * @Description 处理班级通知到学生个人
      * @Date 2023/12/18 17:41:09
@@ -154,8 +163,8 @@ public class NoticeController {
      * @Return com.xhkjedu.vo.ResultVo
      **/
     @GetMapping("/chandle_nuser")
-    public ResultVo chandleNoticeUser(){
+    public ResultVo chandleNoticeUser() {
         noticeService.chandleNoticeUser();
-        return new ResultVo(0,"处理成功");
+        return new ResultVo(0, "处理成功");
     }
 }

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

@@ -2,6 +2,9 @@ package com.xhkjedu.sapi.mapper.notice;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.sapi.model.notice.TNoticeFile;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description
@@ -9,4 +12,6 @@ import com.xhkjedu.sapi.model.notice.TNoticeFile;
  * Date 2023/12/18 14:08
  **/
 public interface NoticeFileMapper extends TkMapper<TNoticeFile> {
+    //通知附件列表
+    List<TNoticeFile> listByNoticeId(@Param("noticeid") Integer noticeid);
 }

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

@@ -5,6 +5,9 @@ import com.xhkjedu.sapi.model.notice.TNotice;
 import com.xhkjedu.sapi.model.notice.TNoticeUser;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 public interface NoticeUserMapper extends TkMapper<TNoticeUser> {
     /**
      * 批量添加
@@ -24,4 +27,7 @@ public interface NoticeUserMapper extends TkMapper<TNoticeUser> {
      **/
     Integer reade(@Param("noticeid") Integer noticeid, @Param("userid") Integer userid
             , @Param("timestamp") int timestamp);
+
+    //通知对象
+    List<Map> listByNoticeId(@Param("noticeid") Integer noticeid);
 }

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

@@ -14,7 +14,7 @@ public class TNoticeFile extends BaseBean {
     private Integer nfid;
 
     //通知id
-    private String noticeid;
+    private Integer noticeid;
 
     //资源名称
     private String resourcename;

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

@@ -25,6 +25,15 @@ public class TNoticeUser extends BaseBean {
     //查看时间
     private Integer readtime;
 
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
+
     //创建时间
     private Integer createtime;
 

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

@@ -2,21 +2,18 @@ package com.xhkjedu.sapi.service.notice;
 
 import com.xhkjedu.sapi.mapper.notice.NoticeClassMapper;
 import com.xhkjedu.sapi.mapper.notice.NoticeMapper;
-import com.xhkjedu.sapi.mapper.notice.NoticeSchoolMapper;
 import com.xhkjedu.sapi.mapper.notice.NoticeUserMapper;
 import com.xhkjedu.sapi.model.notice.TNoticeClass;
 import com.xhkjedu.sapi.model.notice.TNoticeUser;
-import com.xhkjedu.sapi.model.system.TSchool;
+import com.xhkjedu.sapi.mapper.notice.*;
+import com.xhkjedu.sapi.model.notice.TNoticeFile;
 import com.xhkjedu.sapi.model.notice.TNotice;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.sapi.vo.gradeclass.ClassVo;
-import com.xhkjedu.sapi.vo.notice.NoticeUserVo;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author ywx
@@ -33,7 +30,7 @@ public class NoticeService {
     @Resource
     private NoticeUserMapper noticeUserMapper;
     @Resource
-    private NoticeSchoolMapper noticeSchoolMapper;
+    private NoticeFileMapper noticeFileMapper;
 
     //添加
     public Integer save(TNotice model) {
@@ -45,6 +42,15 @@ public class NoticeService {
         //添加通知对象
         saveNoticeObj(model);
 
+        //通知附件
+        List<TNoticeFile> files = model.getFiles();
+        if (N_Utils.isListNotEmpty(files)) {
+            Integer noticeid = model.getNoticeid();
+            for (TNoticeFile file : files) {
+                file.setNoticeid(noticeid);
+            }
+            noticeFileMapper.insertList(files);
+        }
         return model.getId();
     }
 
@@ -68,20 +74,21 @@ public class NoticeService {
             noticeUserMapper.batchSave(model);
         }
 
-        if (N_Utils.isListEmpty(model.getSchools())) {//兼容以前添加单个学校模式
+        /*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);//通知学校关联信息
+        noticeSchoolMapper.batchSave(model);//通知学校关联信息*/
     }
 
     //获取详情
     public TNotice findById(Integer noticeid) {
         TNotice notice = noticeMapper.findById(noticeid);
-        Integer noticetype = notice.getNoticetype();
+        notice.setFiles(noticeFileMapper.listByNoticeId(noticeid));
+        /*Integer noticetype = notice.getNoticetype();
         if (noticetype == 1) {
             List<ClassVo> classes = noticeMapper.listClass(noticeid);
             notice.setClasses(classes);
@@ -91,7 +98,7 @@ public class NoticeService {
         } else {
             List<TSchool> schools = noticeMapper.listSchool(noticeid);
             notice.setSchools(schools);
-        }
+        }*/
         return notice;
     }
 
@@ -131,6 +138,7 @@ public class NoticeService {
      **/
     public TNotice reade(Integer noticeid, Integer createid) {
         TNotice notice = noticeMapper.findById2(noticeid);
+        notice.setFiles(noticeFileMapper.listByNoticeId(noticeid));
         noticeUserMapper.reade(noticeid, createid, N_Utils.getSecondTimestamp());
         return notice;
     }
@@ -162,13 +170,31 @@ public class NoticeService {
         return noticeMapper.listNoticeForStuWeb(notice);
     }
 
-    public void chandleNoticeUser(){
+    /**
+     * @Description 通知对象
+     * @Date 2023/12/18 16:26
+     * @Author YWX
+     * @Param [noticeid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listUser(Integer noticeid) {
+        return noticeUserMapper.listByNoticeId(noticeid);
+    }
+
+    /*
+     * @Description 处理班级学生通知
+     * @Date 2023/12/18 16:10:36
+     * @Author WN
+     * @Param []
+     * @Return void
+     **/
+    public void chandleNoticeUser() {
         //获取需要处理的通知
         List<TNoticeClass> noticeClasses = noticeClassMapper.listAll();
-        for(TNoticeClass noticeClass : noticeClasses){
+        for (TNoticeClass noticeClass : noticeClasses) {
             List<TNoticeUser> noticeUsers = noticeClassMapper.listClassStudent(noticeClass.getClassid());
-            if(N_Utils.isListNotEmpty(noticeUsers)){
-                for(TNoticeUser user : noticeUsers){
+            if (N_Utils.isListNotEmpty(noticeUsers)) {
+                for (TNoticeUser user : noticeUsers) {
                     user.setNoticeid(noticeClass.getNoticeid());
                     user.setReaded(1);
                     user.setCreatetime(noticeClass.getCreatetime());
@@ -176,6 +202,5 @@ public class NoticeService {
                 noticeUserMapper.insertList(noticeUsers);
             }
         }
-
     }
 }

sapi/src/main/java/com/xhkjedu/sapi/vo/notice/NoticeUserVo.java

@@ -12,4 +12,13 @@ public class NoticeUserVo {
 
     //是否查看0未查看1已查看
     private Integer readed;
+
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
 }

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

@@ -0,0 +1,8 @@
+<?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.sapi.mapper.notice.NoticeFileMapper">
+    <!--通知附件列表-->
+    <select id="listByNoticeId" resultType="com.xhkjedu.sapi.model.notice.TNoticeFile">
+        select * from t_notice_file where noticeid=#{noticeid}
+    </select>
+</mapper>

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

@@ -41,7 +41,7 @@
     </select>
     <!--通知用户列表-->
     <select id="listUser" resultType="com.xhkjedu.sapi.vo.notice.NoticeUserVo">
-        select t.userid,tu.username teachername,t.readed
+        select t.userid,tu.username,t.readed
         from t_notice_user t left join t_user tu on t.userid = tu.userid
         where t.noticeid=#{noticeid}
     </select>

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

@@ -3,10 +3,11 @@
 <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)
+        INSERT INTO t_notice_user (noticeid,userid,createtime,schoolid,gradeid,classid,subjectid)
         VALUES
-        <foreach collection ="notice.teachers" item="t" index= "index" separator =",">
-            (#{notice.noticeid},#{t.userid},#{notice.createtime},#{notice.schoolid})
+        <foreach collection ="notice.users" item="t" index= "index" separator =",">
+            (#{notice.noticeid},#{t.userid},#{notice.createtime},#{notice.schoolid}
+            ,#{t.gradeid},#{t.classid},#{t.subjectid})
         </foreach>
     </insert>
     <!--查看-->
@@ -14,4 +15,24 @@
         update t_notice_user nt set nt.readed=1,nt.readtime=#{timestamp}
         where nt.noticeid=#{noticeid} and nt.userid=#{userid}
     </update>
+    <!--通知对象-->
+    <resultMap id="userResult" type="java.util.Map">
+        <result property="gradeid" column="gradeid"/>
+        <result property="classid" column="classid"/>
+        <result property="subjectid" column="subjectid"/>
+        <result property="name" column="name"/>
+        <collection property="users" ofType="java.util.Map" javaType="java.util.List">
+            <result property="userid" column="userid"/>
+            <result property="readed" column="readed"/>
+            <result property="username" column="username"/>
+        </collection>
+    </resultMap>
+    <select id="listByNoticeId" resultMap="userResult">
+        select nu.userid,nu.readed,u.username,nu.gradeid,nu.classid,nu.subjectid
+        ,if(nu.classid is not null,(select c.classname from t_class c where c.classid=nu.classid)
+            ,(select s.subjectname from t_subject s where s.subjectid=nu.subjectid))name
+        from t_notice_user nu left join t_user u on nu.userid = u.userid
+        where nu.noticeid=#{noticeid}
+        order by convert(u.username using gbk)
+    </select>
 </mapper>

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

@@ -9,7 +9,7 @@ import com.xhkjedu.sexam.model.exam.EClassStudent;
 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.notice.TMsg;
 import com.xhkjedu.sexam.model.notice.TNotice;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
 import com.xhkjedu.sexam.service.exam.EBaseService;
 import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.service.report.EReportGenerateService;
@@ -102,6 +102,7 @@ public class EBaseController {
         List<TMsg> msgList = new ArrayList<>();
         String examname = eBaseService.getNameByExamId(examid);
         String noticetitle = examname + "-考试设置";
+        Integer gradeid = vo.getGradeid();
         for (ESubject s : subjects) {
             try {
                 N_Utils.validation(new Object[]{s.getSubjectid(), "科目id", 2});
@@ -116,9 +117,11 @@ public class EBaseController {
                     TNotice n = new TNotice();
                     n.setNoticetitle(noticetitle);
                     n.setNoticecontent(noticecontent);
-                    TNoticeTeacher nt = new TNoticeTeacher();
-                    nt.setTeacherid(teacherid);
-                    n.setTeachers(Arrays.asList(nt));
+                    TNoticeUser nt = new TNoticeUser();
+                    nt.setUserid(teacherid);
+                    nt.setGradeid(gradeid);
+                    nt.setSubjectid(s.getSubjectid());
+                    n.setUsers(Arrays.asList(nt));
                     noticeList.add(n);
                 }
                 if (msg == 1) {
@@ -224,6 +227,7 @@ public class EBaseController {
         vo.setSchoolid(schoolid);
         vo.setHandleid(createid);
         vo.setExamname(examname);
+        vo.setGradeid(exam.getGradeid());
         noticeService.batchSave2(vo, students);
         return new ResultVo(0, "发布成功");
     }

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/ESubjectInvigilateController.java

@@ -7,7 +7,7 @@ import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.exam.ESubjectInvigilate;
 import com.xhkjedu.sexam.model.notice.TMsg;
 import com.xhkjedu.sexam.model.notice.TNotice;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
 import com.xhkjedu.sexam.service.exam.ESubjectInvigilateService;
 import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.vo.exam.EInVigilateVo;
@@ -70,6 +70,7 @@ public class ESubjectInvigilateController {
         Map s = eSubjectInvigilateService.getESubjectByEsId(esid);
         Integer schoolid = (Integer) s.get("schoolid");
         String noticetitle = s.get("examname") + "-监考设置";
+        Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
         for (ESubjectInvigilate ei : teachers) {
             Integer teacherid = ei.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
@@ -81,9 +82,11 @@ public class ESubjectInvigilateController {
                 TNotice n = new TNotice();
                 n.setNoticetitle(noticetitle);
                 n.setNoticecontent(noticecontent);
-                TNoticeTeacher nt = new TNoticeTeacher();
-                nt.setTeacherid(teacherid);
-                n.setTeachers(Arrays.asList(nt));
+                TNoticeUser nt = new TNoticeUser();
+                nt.setUserid(teacherid);
+                nt.setGradeid(gradeid);
+                nt.setSubjectid(subjectid);
+                n.setUsers(Arrays.asList(nt));
                 noticeList.add(n);
             }
             if (msg == 1) {

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectclassController.java

@@ -3,7 +3,7 @@ package com.xhkjedu.sexam.controller.paper;
 import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sexam.model.notice.TMsg;
 import com.xhkjedu.sexam.model.notice.TNotice;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
 import com.xhkjedu.sexam.model.paper.EPaperCorrectclass;
 import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.service.paper.EPaperCorrectclassService;
@@ -62,6 +62,8 @@ public class EPaperCorrectclassController {
         Map s = ePaperCorrectclassService.getESubjectByEpId(epid);
         Integer schoolid = (Integer) s.get("schoolid");
         String noticetitle = s.get("examname") + "-阅卷按班设置";
+        Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
+        String subjectid = s.get("subjectid").toString();
         for (EPaperCorrectclass c : teachers) {
             Integer teacherid = c.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
@@ -73,9 +75,11 @@ public class EPaperCorrectclassController {
                 TNotice n = new TNotice();
                 n.setNoticetitle(noticetitle);
                 n.setNoticecontent(noticecontent);
-                TNoticeTeacher nt = new TNoticeTeacher();
-                nt.setTeacherid(teacherid);
-                n.setTeachers(Arrays.asList(nt));
+                TNoticeUser nt = new TNoticeUser();
+                nt.setUserid(teacherid);
+                nt.setGradeid(gradeid);
+                nt.setSubjectid(subjectid);
+                n.setUsers(Arrays.asList(nt));
                 noticeList.add(n);
             }
             if (msg == 1) {

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectquestionController.java

@@ -3,7 +3,7 @@ package com.xhkjedu.sexam.controller.paper;
 import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sexam.model.notice.TMsg;
 import com.xhkjedu.sexam.model.notice.TNotice;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
 import com.xhkjedu.sexam.model.paper.EPaper;
 import com.xhkjedu.sexam.model.paper.EPaperCorrectquestion;
 import com.xhkjedu.sexam.service.notice.NoticeService;
@@ -57,6 +57,8 @@ public class EPaperCorrectquestionController {
         Map s = ePaperCorrectquestionService.getESubjectByEpId(epid);
         Integer schoolid = (Integer) s.get("schoolid");
         String noticetitle = s.get("examname") + "-阅卷按题设置";
+        Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
+        String subjectid = s.get("subjectid").toString();
         for (EPaperCorrectquestion q : teachers) {
             Integer teacherid = q.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
@@ -68,9 +70,11 @@ public class EPaperCorrectquestionController {
                 TNotice n = new TNotice();
                 n.setNoticetitle(noticetitle);
                 n.setNoticecontent(noticecontent);
-                TNoticeTeacher nt = new TNoticeTeacher();
-                nt.setTeacherid(teacherid);
-                n.setTeachers(Arrays.asList(nt));
+                TNoticeUser nt = new TNoticeUser();
+                nt.setUserid(teacherid);
+                nt.setGradeid(gradeid);
+                nt.setSubjectid(subjectid);
+                n.setUsers(Arrays.asList(nt));
                 noticeList.add(n);
             }
             if (msg == 1) {

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

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

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

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

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

@@ -44,7 +44,7 @@ public class TNotice extends BaseBean {
 
     @Transient
     //教师id集合
-    private List<TNoticeTeacher> teachers = new ArrayList<>();
+    private List<TNoticeUser> users = new ArrayList<>();
 
     @Transient
     //开始时间

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

@@ -8,7 +8,7 @@ import javax.persistence.Table;
 
 @Table(name = "t_notice_user")
 @Data
-public class TNoticeTeacher extends BaseBean {
+public class TNoticeUser extends BaseBean {
     @Id
     //通知用户表
     private Integer nuid;
@@ -17,7 +17,7 @@ public class TNoticeTeacher extends BaseBean {
     private Integer noticeid;
 
     //用户id
-    private Integer teacherid;
+    private Integer userid;
 
     //是否查看0未查看1已查看
     private Integer readed;
@@ -25,6 +25,15 @@ public class TNoticeTeacher extends BaseBean {
     //查看时间
     private Integer readtime;
 
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
+
     //创建时间
     private Integer createtime;
 

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

@@ -33,11 +33,7 @@ public class NoticeService {
     @Resource
     private NoticeMapper noticeMapper;
     @Resource
-    private NoticeTeacherMapper noticeTeacherMapper;
-    @Resource
-    private NoticeClassMapper noticeClassMapper;
-    @Resource
-    private NoticeSchoolMapper noticeSchoolMapper;
+    private NoticeUserMapper noticeUserMapper;
     @Resource
     private MsgMapper msgMapper;
     @Resource
@@ -61,12 +57,10 @@ public class NoticeService {
                 });
                 noticeMapper.insertList(noticeList);
 
-                List<TNoticeTeacher> teacherList = new ArrayList<>();
-                List<TNoticeClass> classList = new ArrayList<>();
-                List<TNoticeSchool> schoolList = new ArrayList<>();
+                List<TNoticeUser> teacherList = new ArrayList<>();
                 noticeList.forEach(n -> {
                     Integer noticeid = n.getId();
-                    List<TNoticeTeacher> teachers = n.getTeachers().stream().distinct().collect(Collectors.toList());
+                    List<TNoticeUser> teachers = n.getUsers().stream().distinct().collect(Collectors.toList());
                     teachers.forEach(t -> {
                         t.setNoticeid(noticeid);
                         t.setReaded(0);
@@ -74,26 +68,9 @@ public class NoticeService {
                         t.setSchoolid(schoolid);
                     });
                     teacherList.addAll(teachers);
-
-                    List<TNoticeClass> classes = n.getClasses();
-                    classes.forEach(c -> {
-                        c.setNoticeid(noticeid);
-                        c.setCreateid(createid);
-                        c.setCreatetime(createtime);
-                    });
-                    classList.addAll(classes);
-
-                    TNoticeSchool ns = new TNoticeSchool();
-                    ns.setNoticeid(noticeid);
-                    ns.setSchoolid(schoolid);
-                    ns.setCreateid(createid);
-                    ns.setCreatetime(createtime);
-                    schoolList.add(ns);
                 });
 
-                if (N_Utils.isListNotEmpty(teacherList)) noticeTeacherMapper.insertList(teacherList);//通知教师关联信息
-                if (N_Utils.isListNotEmpty(classList)) noticeClassMapper.insertList(classList);//通知班级关联信息
-                if (N_Utils.isListNotEmpty(schoolList)) noticeSchoolMapper.insertList(schoolList);//通知学校关联信息
+                if (N_Utils.isListNotEmpty(teacherList)) noticeUserMapper.insertList(teacherList);//通知教师关联信息
             }
 
             if (N_Utils.isListNotEmpty(msgList)) {//短信
@@ -105,11 +82,10 @@ public class NoticeService {
                         msgs.add(msg);
                     }
                 } else {//通知对象2老师
-                    List<Integer> userids = msgList.stream().map(m -> m.getUserid()).distinct().collect(Collectors.toList());
+                    List<Integer> userids = msgList.stream().map(TMsg::getUserid).distinct().collect(Collectors.toList());
                     List<UserVo> users = userMapper.listPhoneByUserIds(userids);//根据用户ids查找手机号
-                    Map<Integer, TMsg> msgMap = msgList.stream().collect(Collectors.toMap(m -> m.getUserid(), m -> m));
-                    for (int i = 0; i < users.size(); i++) {
-                        UserVo u = users.get(i);
+                    Map<Integer, TMsg> msgMap = msgList.stream().collect(Collectors.toMap(TMsg::getUserid, m -> m));
+                    for (UserVo u : users) {
                         String userphone = u.getUserphone();
                         if (N_Utils.isEmpty(userphone)) continue;
                         TMsg m = msgMap.get(u.getUserid());
@@ -122,8 +98,8 @@ public class NoticeService {
                     msgMapper.insertList(msgs);//短信保存到数据库
 
                     //发短信
-                    Integer pageSize = 2000;//手机号，多个手机号为用半角 , 分开，如13899999999,13688888888(最多2000个，必填)
-                    Map<String, List<TMsg>> mcollect = msgs.stream().collect(Collectors.groupingBy(s -> s.getMsgtxt()
+                    int pageSize = 2000;//手机号，多个手机号为用半角 , 分开，如13899999999,13688888888(最多2000个，必填)
+                    Map<String, List<TMsg>> mcollect = msgs.stream().collect(Collectors.groupingBy(TMsg::getMsgtxt
                             , LinkedHashMap::new, Collectors.toList()));
                     for (Map.Entry<String, List<TMsg>> entry : mcollect.entrySet()) {
                         List<TMsg> list = entry.getValue();
@@ -131,7 +107,7 @@ public class NoticeService {
                         for (int i = 0; i < list.size(); i += pageSize) {
                             ZtMsgVo vo = new ZtMsgVo();
                             String userphone = list.stream().skip(i).limit(pageSize)
-                                    .map(s -> s.getUserphone()).collect(Collectors.joining(","));
+                                                   .map(TMsg::getUserphone).collect(Collectors.joining(","));
                             vo.setMobile(userphone);
                             vo.setContent(msgtxt);
                             SMSSender.sendSms(vo);
@@ -140,7 +116,7 @@ public class NoticeService {
                 }
             }
         } catch (Exception e) {
-            log.error("批量添加通知和短信失败", e.getMessage());
+            log.error("批量添加通知和短信失败：{}", e.getMessage());
         }
     }
 
@@ -154,52 +130,68 @@ public class NoticeService {
         Integer examid = examVo.getExamid();
         String examname = examVo.getExamname();
         Integer schoolid = examVo.getSchoolid();
+        Integer gradeid = examVo.getGradeid();
         try {
             List<TNotice> noticeList = new ArrayList<>();
-            List<TNoticeClass> classList = new ArrayList<>();
-            List<TNoticeTeacher> teacherList = new ArrayList<>();
+            List<TNoticeUser> stuList = new ArrayList<>();
+            List<TNoticeUser> teacherList = new ArrayList<>();
             List<TMsg> msgList = new ArrayList<>();
             String noticetitle = examname + "-考试公告";
             List<Map> classes = eClassMapper.listByExamId(examid);
             String classids = classes.stream().map(c -> c.get("classid").toString()).collect(Collectors.joining(","));
             List<UserVo> teachers = userMapper.listTeacherByClassIds(classids);//获取考试班级任教老师
             if (notice == 1) {
-                for (Map s : classes) {
-                    TNoticeClass nt = new TNoticeClass();
-                    nt.setClassid((Integer) s.get("classid"));
-                    classList.add(nt);
+                for (UserVo student : students) {
+                    TNoticeUser nu = new TNoticeUser();
+                    nu.setUserid(student.getUserid());
+                    nu.setGradeid(gradeid);
+                    nu.setClassid(student.getClassid());
+                    stuList.add(nu);
                 }
                 TNotice n = new TNotice();
                 n.setNoticetitle(noticetitle);
                 n.setNoticecontent(examcomm);
-                n.setNoticetype(1);
-                n.setClasses(classList);
+                n.setNoticetype(3);
+                n.setUsers(stuList);
                 noticeList.add(n);
 
                 for (UserVo t : teachers) {
-                    TNoticeTeacher nt = new TNoticeTeacher();
-                    nt.setTeacherid(t.getUserid());
+                    TNoticeUser nt = new TNoticeUser();
+                    nt.setUserid(t.getUserid());
+                    nt.setGradeid(gradeid);
+                    nt.setSubjectid(t.getSubjectid());
                     teacherList.add(nt);
                 }
                 TNotice n2 = new TNotice();
                 n2.setNoticetitle(noticetitle);
                 n2.setNoticecontent(examcomm);
                 n2.setNoticetype(2);
-                n2.setTeachers(teacherList);
+                n2.setUsers(teacherList);
                 noticeList.add(n2);
             }
             if (msg == 1) {
                 String msgtxt = noticetitle + "\n" + ExamUtil.htmlRemoveTag(examcomm);
-                List<String> userphones = students.stream().filter(s -> N_Utils.isNotEmpty(s.getUserphone()))
-                        .map(s -> s.getUserphone()).collect(Collectors.toList());
+                List<String> userphones = new ArrayList<>();
+                for (UserVo student : students) {
+                    if (N_Utils.isNotEmpty(student.getUserphone())) {
+                        String sUserphone = student.getUserphone();
+                        userphones.add(sUserphone);
+                    }
+                }
                 for (String userphone : userphones) {
                     TMsg m = new TMsg();
                     m.setMsgtxt(msgtxt);
                     m.setUserphone(userphone);
                     msgList.add(m);
                 }
-                userphones = teachers.stream().filter(s -> N_Utils.isNotEmpty(s.getUserphone()))
-                        .map(s -> s.getUserphone()).collect(Collectors.toList());
+                List<String> list = new ArrayList<>();
+                for (UserVo s : teachers) {
+                    String sUserphone = s.getUserphone();
+                    if (N_Utils.isNotEmpty(sUserphone)) {
+                        list.add(sUserphone);
+                    }
+                }
+                userphones = list;
                 for (String userphone : userphones) {
                     TMsg m = new TMsg();
                     m.setMsgtxt(msgtxt);
@@ -217,12 +209,10 @@ public class NoticeService {
                 });
                 noticeMapper.insertList(noticeList);
 
-                List<TNoticeTeacher> nteacherList = new ArrayList<>();
-                List<TNoticeClass> nclassList = new ArrayList<>();
-                List<TNoticeSchool> schoolList = new ArrayList<>();
+                List<TNoticeUser> nteacherList = new ArrayList<>();
                 noticeList.forEach(n -> {
                     Integer noticeid = n.getId();
-                    List<TNoticeTeacher> cteachers = n.getTeachers().stream().distinct().collect(Collectors.toList());
+                    List<TNoticeUser> cteachers = n.getUsers().stream().distinct().collect(Collectors.toList());
                     cteachers.forEach(t -> {
                         t.setNoticeid(noticeid);
                         t.setReaded(0);
@@ -230,26 +220,9 @@ public class NoticeService {
                         t.setSchoolid(schoolid);
                     });
                     nteacherList.addAll(cteachers);
-
-                    List<TNoticeClass> nclasses = n.getClasses();
-                    nclasses.forEach(c -> {
-                        c.setNoticeid(noticeid);
-                        c.setCreateid(createid);
-                        c.setCreatetime(createtime);
-                    });
-                    nclassList.addAll(nclasses);
-
-                    TNoticeSchool ns = new TNoticeSchool();
-                    ns.setNoticeid(noticeid);
-                    ns.setSchoolid(schoolid);
-                    ns.setCreateid(createid);
-                    ns.setCreatetime(createtime);
-                    schoolList.add(ns);
                 });
 
-                if (N_Utils.isListNotEmpty(nteacherList)) noticeTeacherMapper.insertList(teacherList);//通知教师关联信息
-                if (N_Utils.isListNotEmpty(nclassList)) noticeClassMapper.insertList(classList);//通知班级关联信息
-                if (N_Utils.isListNotEmpty(schoolList)) noticeSchoolMapper.insertList(schoolList);//通知学校关联信息
+                if (N_Utils.isListNotEmpty(nteacherList)) noticeUserMapper.insertList(teacherList);//通知教师关联信息
             }
 
             if (N_Utils.isListNotEmpty(msgList)) {//短信
@@ -262,8 +235,8 @@ public class NoticeService {
                     msgMapper.insertList(msgs);//短信保存到数据库
 
                     //发短信
-                    Integer pageSize = 2000;//手机号，多个手机号为用半角 , 分开，如13899999999,13688888888(最多2000个，必填)
-                    Map<String, List<TMsg>> mcollect = msgs.stream().collect(Collectors.groupingBy(s -> s.getMsgtxt()
+                    int pageSize = 2000;//手机号，多个手机号为用半角 , 分开，如13899999999,13688888888(最多2000个，必填)
+                    Map<String, List<TMsg>> mcollect = msgs.stream().collect(Collectors.groupingBy(TMsg::getMsgtxt
                             , LinkedHashMap::new, Collectors.toList()));
                     for (Map.Entry<String, List<TMsg>> entry : mcollect.entrySet()) {
                         List<TMsg> list = entry.getValue();
@@ -271,7 +244,7 @@ public class NoticeService {
                         for (int i = 0; i < list.size(); i += pageSize) {
                             ZtMsgVo vo = new ZtMsgVo();
                             String userphone = list.stream().skip(i).limit(pageSize)
-                                    .map(s -> s.getUserphone()).collect(Collectors.joining(","));
+                                                   .map(TMsg::getUserphone).collect(Collectors.joining(","));
                             vo.setMobile(userphone);
                             vo.setContent(msgtxt);
                             SMSSender.sendSms(vo);
@@ -280,7 +253,7 @@ public class NoticeService {
                 }
             }
         } catch (Exception e) {
-            log.error("批量添加通知和短信（发布考试用）失败", e.getMessage());
+            log.error("批量添加通知和短信（发布考试用）失败：{}", e.getMessage());
         }
     }
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/exam/ExamVo.java

@@ -21,6 +21,9 @@ public class ExamVo {
 
     //学校id
     private Integer schoolid;
+    
+    //年级id
+    private Integer gradeid;
 
     //考试名称
     private String examname;

sexam/src/main/resources/mapper/exam/EBaseMapper.xml

@@ -120,7 +120,7 @@
     </select>
     <!--根据考试id获取状态和模式-->
     <select id="getExamStateAndMode" resultType="com.xhkjedu.sexam.vo.exam.EBaseVo">
-        select eb.examstate,eb.exammode
+        select eb.examstate,eb.exammode,eb.gradeid
         from e_base eb where eb.examid=#{examid}
     </select>
     <!--根据考试id获取显示排名-->

sexam/src/main/resources/mapper/notice/NoticeTeacherMapper.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.sexam.mapper.notice.NoticeTeacherMapper">
-    <!--批量添加-->
-    <insert id="batchSave" parameterType="com.xhkjedu.sexam.model.notice.TNotice">
-        INSERT INTO t_notice_user (noticeid,teacherid,createtime,schoolid)
-        VALUES
-        <foreach collection ="notice.teachers" item="t" index= "index" separator =",">
-            (#{notice.noticeid},#{t.teacherid},#{notice.createtime},#{notice.schoolid})
-        </foreach>
-    </insert>
-</mapper>

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

@@ -0,0 +1,4 @@
+<?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>

sexam/src/main/resources/mapper/paper/EPaperMapper.xml

@@ -73,7 +73,7 @@
     </select>
     <!--根据试卷id获取考试科目基本信息-->
     <select id="getESubjectByEpId" resultType="java.util.Map">
-        select es.sdate,es.begintime,es.endtime,eb.examname,eb.schoolid
+        select es.sdate,es.begintime,es.endtime,eb.examname,eb.schoolid,eb.gradeid,es.subjectid
         from e_paper ep left join e_subject es on ep.esid = es.esid
         left join e_base eb on es.examid = eb.examid
         where ep.epid=#{epid}

sexam/src/main/resources/mapper/system/UserMapper.xml

@@ -18,6 +18,7 @@
     <!--获取考试班级任教老师-->
     <select id="listTeacherByClassIds" resultType="com.xhkjedu.vo.system.UserVo">
         select u.userid,u.userphone
+        ,(select tp.subjectid from t_teacher_powersb tp where tp.teacherid=ct.teacherid limit 1)subjectid
         from t_class_teacher ct left join t_user u on ct.teacherid = u.userid
         where ct.classid in(${classids}) and u.userstate=1
         group by u.userid

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/GradeController.java

@@ -73,6 +73,14 @@ public class GradeController {
         return new ResultVo(0,"获取班级列表成功",list);
     }
 
+    @PostMapping("/list_class_stu")
+    public ResultVo listClassStu(@RequestBody TGrade tGrade) {
+        Integer schoolid = tGrade.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
+        List<Map> list = gradeService.listClassStu(schoolid, tGrade.getClasstype());
+        return new ResultVo(0, "获取班级学生列表成功", list);
+    }
+
     //教师设置班级权限
     @PostMapping("/lct")
     public ResultVo listClassForTeacher(@RequestBody TGrade tGrade) {

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/GradeMapper.java

@@ -24,6 +24,15 @@ public interface GradeMapper extends TkMapper<TGrade> {
      **/
     List<GradeVo> listClass(@Param("schoolid") Integer schoolid, @Param("year") Integer year,@Param("classtype") Integer classtype);
 
+    /**
+     * @Description 获取班级学生列表
+     * @Date 2023/12/18 14:51
+     * @Author YWX
+     * @Param [schoolid, year, classtype]
+     * @Return java.util.List<java.util.Map>
+     **/
+    List<Map> listClassStu(@Param("schoolid") Integer schoolid, @Param("year") Integer year,@Param("classtype") Integer classtype);
+
     /**
      * 获取通知教师列表
      * @Param [schoolid, year]

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/GradeService.java

@@ -67,6 +67,18 @@ public class GradeService {
         return gradeMapper.listClass(schoolid, year, classtype);
     }
 
+    /**
+     * @Description 获取班级学生列表
+     * @Date 2023/12/18 14:50
+     * @Author YWX
+     * @Param [schoolid, classtype]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listClassStu(Integer schoolid, Integer classtype) {
+        Integer year = schoolMapper.getYearById(schoolid);
+        return gradeMapper.listClassStu(schoolid, year, classtype);
+    }
+
     /**
      * 获取通知教师列表
      *

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

@@ -51,6 +51,34 @@
         </if>
          order by c.gradeid,c.classtype,c.classorder,c.classid desc
     </select>
+    <!--获取班级学生列表-->
+    <resultMap id="gradeClassResult" type="java.util.Map">
+        <result property="gradeid" column="gradeid"/>
+        <collection property="classes" ofType="java.util.Map" javaType="java.util.List">
+            <result property="classid" column="classid"/>
+            <result property="classname" column="classname"/>
+            <result property="classnum" column="classnum"/>
+            <result property="classtype" column="classtype"/>
+            <collection property="students" ofType="java.util.Map" javaType="java.util.List">
+                <result property="studentid" column="studentid"/>
+                <result property="username" column="username"/>
+            </collection>
+        </collection>
+    </resultMap>
+    <select id="listClassStu" resultMap="gradeClassResult">
+        select c.gradeid,c.classid,c.classname,c.classnum,c.classtype,c.classorder,c.year,c.schoolyear
+        ,cs.studentid,u.username
+        from t_class c left join t_class_student cs on c.classid=cs.classid
+        left join t_user u on cs.studentid = u.userid
+        where c.schoolid=#{schoolid} and c.year=#{year} and c.classstate=1 and c.classnum>0
+        <if test="classtype!=null and classtype!=0">
+            and c.classtype=#{classtype}
+        </if>
+        <if test="classtype==null or classtype==0">
+            and c.classtype <![CDATA[ < ]]>5
+        </if>
+        order by c.gradeid,c.classtype,c.classorder,c.classid desc
+    </select>
 
     <!--教师设置权限班级-->
     <select id="listClassForTeacher" resultMap="gradeResult">