监考设置列表返回未设置监考人班级数量 通知、短信不发送

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/EClassMapper.java

@@ -35,4 +35,7 @@ public interface EClassMapper extends TkMapper<EClass> {
 
     //按班设置教师列表
     List<Map> listClassTeacher(@Param("classids") String classids, @Param("subjectid") String subjectid);
+
+    //获取考试班级数量
+    Integer getClassNumByExamId(@Param("examid") Integer examid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/ESubjectInvigilateMapper.java

@@ -12,7 +12,7 @@ public interface ESubjectInvigilateMapper extends TkMapper<ESubjectInvigilate> {
     void delByEsId(@Param("esid") Integer esid);
 
     //监考设置列表
-    List<Map> listSubject(@Param("examid") Integer examid);
+    List<Map> listSubject(@Param("examid") Integer examid, @Param("classnum") Integer classnum);
 
     //考试监考人
     List<Map> listByEsId(@Param("esid") Integer esid);

sexam/src/main/java/com/xhkjedu/sexam/service/exam/ESubjectInvigilateService.java

@@ -42,7 +42,8 @@ public class ESubjectInvigilateService {
     //监考设置列表
     public Map listSubject(Integer examid) {
         Map map = eBaseMapper.findById(examid);
-        List<Map> subjects = eSubjectInvigilateMapper.listSubject(examid);//监考设置列表
+        Integer classnum = eClassMapper.getClassNumByExamId(examid);//获取考试班级数量
+        List<Map> subjects = eSubjectInvigilateMapper.listSubject(examid, classnum);//监考设置列表
         map.put("subjects", subjects);
         return map;
     }

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

@@ -49,6 +49,8 @@ public class NoticeService {
     //批量添加通知和短信
     @Transactional(rollbackFor = Exception.class)
     public void batchSave(List<TNotice> noticeList, List<TMsg> msgList, Integer schoolid, Integer createid, Integer noticetype) {
+        noticeList = null;
+        msgList = null;
         Integer createtime = N_Utils.getSecondTimestamp();
         if (N_Utils.isListNotEmpty(noticeList)) {//通知
             noticeList.forEach(n -> {
@@ -141,6 +143,8 @@ public class NoticeService {
 
     //批量添加通知和短信（发布考试用）
     public void batchSave2(List<TNotice> noticeList, List<TMsg> msgList, Integer schoolid, Integer createid) {
+        noticeList = null;
+        msgList = null;
         Integer createtime = N_Utils.getSecondTimestamp();
         if (N_Utils.isListNotEmpty(noticeList)) {//通知
             noticeList.forEach(n -> {

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

@@ -60,4 +60,8 @@
         where ct.classid in(${classids}) and sb.subjectid=#{subjectid} and u.userstate=1
         group by ct.classid,ct.teacherid
     </select>
+    <!--获取考试班级数量-->
+    <select id="getClassNumByExamId" resultType="java.lang.Integer">
+        select count(*) from e_class where examid=#{examid}
+    </select>
 </mapper>

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

@@ -7,13 +7,13 @@
     </delete>
     <!--监考设置列表-->
     <select id="listSubject" resultType="java.util.Map">
-        select s.esid,s.subjectid,s.sdate,s.begintime,s.endtime,s.esstate,s.subjectname
-        ,ifnull(ep.pnum,0)pnum,ifnull(ep.pscore,0)pscore,ep.correcttype
-        ,(select group_concat(distinct u.username separator '、')
-        from e_subject_invigilate ei left join t_user u on ei.teacherid = u.userid
-        where ei.esid=s.esid and ei.majored=1)majorname
-        from e_subject s left join e_paper ep on s.esid = ep.esid
-        where s.examid=#{examid}
+        select s.*,ifnull(ep.pnum,0)pnum,ifnull(ep.pscore,0)pscore,ep.correcttype
+        from (select s.esid,s.subjectid,s.sdate,s.begintime,s.endtime,s.esstate,s.subjectname
+        ,group_concat(u.username separator '、')majorname
+        ,#{classnum}-count(DISTINCT ei.classid) einum
+        from e_subject s left join e_subject_invigilate ei on ei.esid=s.esid
+        left join t_user u on u.userid=ei.teacherid and ei.majored=1
+        where s.examid=#{examid} group by s.esid)s left join e_paper ep on s.esid = ep.esid
     </select>
     <!--考试监考人-->
     <select id="listByEsId" resultType="java.util.Map">