考试通知完善

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

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -71,23 +70,20 @@ public class ESubjectInvigilateController {
         Integer schoolid = (Integer) s.get("schoolid");
         String noticetitle = s.get("examname") + "-监考设置";
         Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
+        String noticecontent = "【" + subjectname + "】";
+        if (N_Utils.isNotEmpty(s.get("sdate"))) {
+            noticecontent += s.get("sdate") + " " + s.get("begintime") + "-" + s.get("endtime") + "\n请在规定时间段监考";
+        }
+        List<TNoticeUser> users = new ArrayList<>();
         for (ESubjectInvigilate ei : teachers) {
             Integer teacherid = ei.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
-            String noticecontent = "【" + subjectname + "】";
-            if (N_Utils.isNotEmpty(s.get("sdate"))) {
-                noticecontent += s.get("sdate") + " " + s.get("begintime") + "-" + s.get("endtime") + "\n请在规定时间段监考";
-            }
             if (notice == 1) {
-                TNotice n = new TNotice();
-                n.setNoticetitle(noticetitle);
-                n.setNoticecontent(noticecontent);
                 TNoticeUser nt = new TNoticeUser();
                 nt.setUserid(teacherid);
                 nt.setGradeid(gradeid);
                 nt.setSubjectid(subjectid);
-                n.setUsers(Arrays.asList(nt));
-                noticeList.add(n);
+                users.add(nt);
             }
             if (msg == 1) {
                 TMsg m = new TMsg();
@@ -96,6 +92,13 @@ public class ESubjectInvigilateController {
                 msgList.add(m);
             }
         }
+        if (notice == 1) {
+            TNotice n = new TNotice();
+            n.setNoticetitle(noticetitle);
+            n.setNoticecontent(noticecontent);
+            n.setUsers(users);
+            noticeList.add(n);
+        }
         noticeService.batchSave(noticeList, msgList, schoolid, createid, 2);
         return new ResultVo(0, "设置成功");
     }

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

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -64,23 +63,20 @@ public class EPaperCorrectclassController {
         String noticetitle = s.get("examname") + "-阅卷按班设置";
         Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
         String subjectid = s.get("subjectid").toString();
+        String noticecontent = "【" + subjectname + "】";
+        if (N_Utils.isNotEmpty(s.get("sdate"))) {
+            noticecontent += s.get("sdate") + " " + s.get("begintime") + "-" + s.get("endtime") + "\n请在规定时间段阅卷";
+        }
+        List<TNoticeUser> users = new ArrayList<>();
         for (EPaperCorrectclass c : teachers) {
             Integer teacherid = c.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
-            String noticecontent = "【" + subjectname + "】";
-            if (N_Utils.isNotEmpty(s.get("sdate"))) {
-                noticecontent += s.get("sdate") + " " + s.get("begintime") + "-" + s.get("endtime") + "\n请在规定时间段阅卷";
-            }
             if (notice == 1) {
-                TNotice n = new TNotice();
-                n.setNoticetitle(noticetitle);
-                n.setNoticecontent(noticecontent);
                 TNoticeUser nt = new TNoticeUser();
                 nt.setUserid(teacherid);
                 nt.setGradeid(gradeid);
                 nt.setSubjectid(subjectid);
-                n.setUsers(Arrays.asList(nt));
-                noticeList.add(n);
+                users.add(nt);
             }
             if (msg == 1) {
                 TMsg m = new TMsg();
@@ -89,6 +85,13 @@ public class EPaperCorrectclassController {
                 msgList.add(m);
             }
         }
+        if (notice == 1) {
+            TNotice n = new TNotice();
+            n.setNoticetitle(noticetitle);
+            n.setNoticecontent(noticecontent);
+            n.setUsers(users);
+            noticeList.add(n);
+        }
         noticeService.batchSave(noticeList, msgList, schoolid, createid, 2);
         return new ResultVo(0, "设置成功");
     }

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

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -59,23 +58,20 @@ public class EPaperCorrectquestionController {
         String noticetitle = s.get("examname") + "-阅卷按题设置";
         Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
         String subjectid = s.get("subjectid").toString();
+        String noticecontent = "【" + subjectname + "】";
+        if (N_Utils.isNotEmpty(s.get("sdate"))) {
+            noticecontent += s.get("sdate") + " " + s.get("begintime") + "-" + s.get("endtime") + "\n请在规定时间段阅卷";
+        }
+        List<TNoticeUser> users = new ArrayList<>();
         for (EPaperCorrectquestion q : teachers) {
             Integer teacherid = q.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
-            String noticecontent = "【" + subjectname + "】";
-            if (N_Utils.isNotEmpty(s.get("sdate"))) {
-                noticecontent += s.get("sdate") + " " + s.get("begintime") + "-" + s.get("endtime") + "\n请在规定时间段阅卷";
-            }
             if (notice == 1) {
-                TNotice n = new TNotice();
-                n.setNoticetitle(noticetitle);
-                n.setNoticecontent(noticecontent);
                 TNoticeUser nt = new TNoticeUser();
                 nt.setUserid(teacherid);
                 nt.setGradeid(gradeid);
                 nt.setSubjectid(subjectid);
-                n.setUsers(Arrays.asList(nt));
-                noticeList.add(n);
+                users.add(nt);
             }
             if (msg == 1) {
                 TMsg m = new TMsg();
@@ -84,6 +80,13 @@ public class EPaperCorrectquestionController {
                 msgList.add(m);
             }
         }
+        if (notice == 1) {
+            TNotice n = new TNotice();
+            n.setNoticetitle(noticetitle);
+            n.setNoticecontent(noticecontent);
+            n.setUsers(users);
+            noticeList.add(n);
+        }
         noticeService.batchSave(noticeList, msgList, schoolid, createid, 2);
         return new ResultVo(0, "设置成功");
     }

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

@@ -132,40 +132,34 @@ public class NoticeService {
         Integer gradeid = examVo.getGradeid();
         try {
             List<TNotice> noticeList = new ArrayList<>();
-            List<TNoticeUser> stuList = new ArrayList<>();
-            List<TNoticeUser> teacherList = new ArrayList<>();
+            List<TNoticeUser> users = 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 (UserVo t : teachers) {
+                    TNoticeUser nt = new TNoticeUser();
+                    nt.setUserid(t.getUserid());
+                    nt.setGradeid(gradeid);
+                    nt.setSubjectid(t.getSubjectid());
+                    users.add(nt);
+                }
+
                 for (UserVo student : students) {
                     TNoticeUser nu = new TNoticeUser();
                     nu.setUserid(student.getUserid());
                     nu.setGradeid(gradeid);
                     nu.setClassid(student.getClassid());
-                    stuList.add(nu);
+                    users.add(nu);
                 }
-                TNotice n = new TNotice();
-                n.setNoticetitle(noticetitle);
-                n.setNoticecontent(examcomm);
-                n.setNoticetype(3);
-                n.setUsers(stuList);
-                noticeList.add(n);
 
-                for (UserVo t : teachers) {
-                    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.setUsers(teacherList);
+                n2.setNoticetype(1);
+                n2.setUsers(users);
                 noticeList.add(n2);
             }
             if (msg == 1) {
@@ -220,7 +214,7 @@ public class NoticeService {
                     nteacherList.addAll(cteachers);
                 });
 
-                if (N_Utils.isListNotEmpty(nteacherList)) noticeUserMapper.insertList(teacherList);//通知教师关联信息
+                if (N_Utils.isListNotEmpty(nteacherList)) noticeUserMapper.insertList(users);//通知教师关联信息
             }
 
             if (N_Utils.isListNotEmpty(msgList)) {//短信