Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -13,6 +13,7 @@ import com.xhkjedu.sexam.service.exam.EBaseService;
 import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.vo.exam.EBaseVo;
 import com.xhkjedu.sexam.vo.exam.ExamVo;
+import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -178,7 +179,7 @@ public class EBaseController {
         if (exam.getWwcnum() != 0) return new ResultVo(1, "还有考试试卷未设置完成");
         if (exam.getExamstate() != 0) return new ResultVo(0, "发布成功");
 
-        List<Map> students = eBaseService.listStuByExamId(examid);//获取考生
+        List<UserVo> students = eBaseService.listStuByExamId(examid);//获取考生
         eBaseService.updateExamStateStart(examid, examcomm, students);//发布考试
 
         if (notice == 2 && msg == 2) return new ResultVo(0, "发布成功");
@@ -190,7 +191,7 @@ public class EBaseController {
         String noticetitle = examname + "-考试公告";
         List<Map> classes = eBaseService.listClass(examid);
         String classids = classList.stream().map(c -> c.getClassid().toString()).collect(Collectors.joining(","));
-        List<Map> teachers = eBaseService.listTeacherByClassIds(classids);//获取考试班级任教老师
+        List<UserVo> teachers = eBaseService.listTeacherByClassIds(classids);//获取考试班级任教老师
         if (notice == 1) {
             for (Map s : classes) {
                 TNoticeClass nt = new TNoticeClass();
@@ -204,9 +205,9 @@ public class EBaseController {
             n.setClasses(classList);
             noticeList.add(n);
 
-            for (Map t : teachers) {
+            for (UserVo t : teachers) {
                 TNoticeTeacher nt = new TNoticeTeacher();
-                nt.setTeacherid((Integer) t.get("teacherid"));
+                nt.setTeacherid(t.getUserid());
                 teacherList.add(nt);
             }
             TNotice n2 = new TNotice();
@@ -218,16 +219,16 @@ public class EBaseController {
         }
         if (msg == 1) {
             String msgtxt = noticetitle + "\n" + examcomm;
-            List<String> userphones = students.stream().filter(s -> N_Utils.isNotEmpty(s.get("userphone")))
-                    .map(s -> s.get("userphone").toString()).collect(Collectors.toList());
+            List<String> userphones = students.stream().filter(s -> N_Utils.isNotEmpty(s.getUserphone()))
+                    .map(s -> s.getUserphone()).collect(Collectors.toList());
             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.get("userphone")))
-                    .map(s -> s.get("userphone").toString()).collect(Collectors.toList());
+            userphones = teachers.stream().filter(s -> N_Utils.isNotEmpty(s.getUserphone()))
+                    .map(s -> s.getUserphone()).collect(Collectors.toList());
             for (String userphone : userphones) {
                 TMsg m = new TMsg();
                 m.setMsgtxt(msgtxt);
@@ -354,4 +355,20 @@ public class EBaseController {
         eBaseService.setSubjectTeacher(subject);
         return new ResultVo(0, "设置成功");
     }
+
+    /**
+     * 考试设置状态
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [eBase]
+     * @Author ywx
+     * @Date 2022/7/28 9:37
+     **/
+    @PostMapping("/get_set")
+    public ResultVo getSetState(@RequestBody EBase eBase) {
+        Integer examid = eBase.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        Map map = eBaseService.getSetState(examid);
+        return new ResultVo(0, "获取考试设置状态成功", map);
+    }
 }

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

@@ -35,4 +35,7 @@ public interface EBaseMapper extends TkMapper<EBase> {
 
     //根据考试id获取考试状态信息
     EBaseVo getExamStateById(@Param("examid") Integer examid);
+
+    //考试设置状态
+    Map getSetState(@Param("examid") Integer examid);
 }

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/mapper/system/UserMapper.java

@@ -1,17 +1,17 @@
 package com.xhkjedu.sexam.mapper.system;
 
+import com.xhkjedu.sexam.vo.system.UserVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 public interface UserMapper {
     //根据用户ids查找手机号
-    List<Map> listPhoneByUserIds(@Param("userids") List<Integer> userids);
+    List<UserVo> listPhoneByUserIds(@Param("userids") List<Integer> userids);
 
     //获取考生
-    List<Map> listStuByExamId(@Param("examid") Integer examid);
+    List<UserVo> listStuByExamId(@Param("examid") Integer examid);
 
     //获取考试班级任教老师
-    List<Map> listTeacherByClassIds(@Param("classids") String classids);
+    List<UserVo> listTeacherByClassIds(@Param("classids") String classids);
 }

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

@@ -14,6 +14,7 @@ import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.paper.EPaper;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
 import com.xhkjedu.sexam.vo.exam.EBaseVo;
+import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
@@ -148,7 +149,7 @@ public class EBaseService {
 
     //发布考试
     @Transactional(rollbackFor = Exception.class)
-    public void updateExamStateStart(Integer examid, String examcomm, List<Map> students) {
+    public void updateExamStateStart(Integer examid, String examcomm, List<UserVo> students) {
         //更改考试状态
         eBaseMapper.postExam(examid, examcomm);
         //发布考试，获取考试试卷题量和分值
@@ -160,13 +161,13 @@ public class EBaseService {
             Integer epid = paper.getEpid();
             Integer pnum = paper.getPnum();
             Double pscore = paper.getPscore();
-            for (Map student : students) {
+            for (UserVo student : students) {
                 EPaperStudent es = new EPaperStudent();
                 es.setExamid(examid);
                 es.setEsid(esid);
                 es.setEpid(epid);
-                es.setClassid((Integer) student.get("classid"));
-                es.setStudentid((Integer) student.get("userid"));
+                es.setClassid(student.getClassid());
+                es.setStudentid(student.getUserid());
                 es.setSstate(0);
                 es.setChecked(0);
                 es.setNum(pnum);
@@ -236,7 +237,7 @@ public class EBaseService {
     }
 
     //获取考生
-    public List<Map> listStuByExamId(Integer examid) {
+    public List<UserVo> listStuByExamId(Integer examid) {
         return userMapper.listStuByExamId(examid);
     }
 
@@ -250,7 +251,7 @@ public class EBaseService {
         return eSubjectMapper.countNoCompletePaper(examid);
     }
 
-    public List<Map> listTeacherByClassIds(String classids) {
+    public List<UserVo> listTeacherByClassIds(String classids) {
         return userMapper.listTeacherByClassIds(classids);
     }
 
@@ -258,4 +259,9 @@ public class EBaseService {
     public void setSubjectTeacher(ESubject subject) {
         eSubjectMapper.updateByPrimaryKeySelective(subject);
     }
+
+    //考试设置状态
+    public Map getSetState(Integer examid) {
+        return eBaseMapper.getSetState(examid);
+    }
 }

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

@@ -13,6 +13,7 @@ import com.xhkjedu.sexam.model.notice.TNoticeSchool;
 import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
 import com.xhkjedu.sexam.utils.SMSSender;
 import com.xhkjedu.sexam.vo.exam.ZtMsgVo;
+import com.xhkjedu.sexam.vo.system.UserVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,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 -> {
@@ -103,13 +106,13 @@ public class NoticeService {
                 }
             } else {//通知对象2老师
                 List<Integer> userids = msgList.stream().map(m -> m.getUserid()).distinct().collect(Collectors.toList());
-                List<Map> users = userMapper.listPhoneByUserIds(userids);//根据用户ids查找手机号
+                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++) {
-                    Map u = users.get(i);
-                    String userphone = u.get("userphone").toString();
+                    UserVo u = users.get(i);
+                    String userphone = u.getUserphone();
                     if (N_Utils.isEmpty(userphone)) continue;
-                    TMsg m = msgMap.get(u.get("userid"));
+                    TMsg m = msgMap.get(u.getUserid());
                     m.setUserphone(userphone);
                     m.setCreatetime(createtime);
                     msgs.add(m);
@@ -140,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/java/com/xhkjedu/sexam/vo/system/UserVo.java

@@ -0,0 +1,17 @@
+package com.xhkjedu.sexam.vo.system;
+
+import lombok.Data;
+
+/**
+ * @author ywx
+ * @className UserVo
+ * @description 用户
+ * @date 2022/7/28 9:45
+ **/
+@Data
+public class UserVo {
+    private Integer userid;//用户id
+    private String username;//姓名
+    private String userphone;//手机号
+    private Integer classid;//班级id
+}

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

@@ -67,4 +67,17 @@
         from e_base eb left join e_subject es on eb.examid = es.examid
         where eb.examid=#{examid}
     </select>
+    <!--考试设置状态-->
+    <select id="getSetState" resultType="java.util.Map">
+        select count(distinct case when es.begintime is null or es.begintime='' then es.esid else null end)esnum
+        ,min(es.esstate)esstate,min(ifnull(ep.correcttype,0))correcttype
+        ,(case when b.exammode=1 then (count(distinct es.esid)-count(distinct ei.esid))
+        else (select sum(ec.classnum)-count(ps.epsid) from e_class ec
+        left join e_paper_student ps on ec.examid=ps.examid and ps.sstate in(0,1)
+        where ec.examid=b.examid) end)papernum
+        from e_base b left join e_subject es on es.examid=b.examid
+        left join e_paper ep on ep.esid = es.esid
+        left join e_subject_invigilate ei on ei.esid = es.esid
+        where b.examid=#{examid}
+    </select>
 </mapper>

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">

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

@@ -39,7 +39,7 @@
     <!--考试科目设置列表-->
     <select id="listSubjectSet" resultType="java.util.Map">
         select es.subjectid,es.subjectname,es.sdate,es.begintime,es.endtime,es.esstate
-        ,ep.correcttype
+        ,ep.correcttype,es.esid,ep.epid
         ,(select count(*) from e_subject_invigilate ei where ei.esid=es.esid)jkjsnum
         ,count(case when eps.sstate=3 then eps.epsid else null end)qknum
         ,count(case when eps.sstate=2 then eps.epsid else null end)tjnum

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

@@ -2,21 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sexam.mapper.system.UserMapper">
     <!--根据用户ids查找手机号-->
-    <select id="listPhoneByUserIds" resultType="java.util.Map">
+    <select id="listPhoneByUserIds" resultType="com.xhkjedu.sexam.vo.system.UserVo">
         select userid,userphone from t_user where userid in
         <foreach collection="userids" item="userid" open="(" separator="," close=")">
             ${userid}
         </foreach>
     </select>
     <!--获取考生-->
-    <select id="listStuByExamId" resultType="java.util.Map">
+    <select id="listStuByExamId" resultType="com.xhkjedu.sexam.vo.system.UserVo">
         select u.userid,u.userphone,ec.classid
         from e_class ec left join t_class_student cs on ec.classid = cs.classid
         left join t_user u on cs.studentid = u.userid
         where ec.examid=#{examid}
     </select>
     <!--获取考试班级任教老师-->
-    <select id="listTeacherByClassIds" resultType="java.util.Map">
+    <select id="listTeacherByClassIds" resultType="com.xhkjedu.sexam.vo.system.UserVo">
         select u.userid,u.userphone
         from t_class_teacher ct left join t_user u on ct.studentid = u.userid
         where ct.classid in(${classids}) and u.userstate=1