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

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

@@ -214,7 +214,8 @@ public class EBaseController {
         if (exam.getExamstate() != 0) return new ResultVo(0, "发布成功");
 
         List<UserVo> students = eBaseService.listStuByExamId(examid);//获取考生
-        eBaseService.updateExamStateStart(examid, examcomm, students,exam.getExammode());//发布考试
+        Integer code = eBaseService.updateExamStateStart(examid, examcomm, students, exam.getExammode());//发布考试
+        if (code == 1) return new ResultVo(1, "发布考试失败");
 
         if (notice == 2 && msg == 2) return new ResultVo(0, "发布成功");
 

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

@@ -3,7 +3,6 @@ package com.xhkjedu.sexam.controller.exam;
 import com.xhkjedu.sexam.model.exam.EBase;
 import com.xhkjedu.sexam.model.exam.EClassStudent;
 import com.xhkjedu.sexam.model.exam.ESubject;
-import com.xhkjedu.sexam.model.exam.ESubjectInvigilate;
 import com.xhkjedu.sexam.service.exam.ESubjectSearchService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
@@ -38,10 +37,9 @@ public class ESubjectSearchController {
      **/
     @PostMapping("/list_st")
     public ResultVo listSearchTeacher(@RequestBody EBase base) {
-        Integer examid = base.getExamid();
         Integer schoolid = base.getSchoolid();
-        N_Utils.validation(new Object[]{examid, "考试id", 1, schoolid, "学校id", 1});
-        List<Map> list = eSubjectSearchService.listSearchTeacher(examid, schoolid);
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
+        List<Map> list = eSubjectSearchService.listSearchTeacher(schoolid);
         return new ResultVo(0, "获取成功", list);
     }
 
@@ -54,11 +52,11 @@ public class ESubjectSearchController {
      * @Date 2022/7/19 14:33
      **/
     @PostMapping("/list_qt")
-    public ResultVo listQuickTeacher(@RequestBody ESubjectInvigilate subject) {
+    public ResultVo listQuickTeacher(@RequestBody EBase subject) {
         String username = subject.getCreatename();
-        Integer classid = subject.getClassid();
-        N_Utils.validation(new Object[]{username, "姓名", 2});
-        Map list = eSubjectSearchService.listQuickTeacher(username, classid);
+        Integer schoolid = subject.getSchoolid();
+        N_Utils.validation(new Object[]{username, "姓名", 2, schoolid, "学校id", 1});
+        Map list = eSubjectSearchService.listQuickTeacher(username, schoolid);
         return new ResultVo(0, "获取成功", list);
     }
 

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

@@ -30,8 +30,8 @@ public interface EClassMapper extends TkMapper<EClass> {
     //获取学校所有教师
     List<CTeacherVo> listTeacherBySchoolId(@Param("schoolid") Integer schoolid);
 
-    //班级教师查找
-    List<Map> listSearchTeacher(@Param("usernames") String[] usernames, @Param("classid") Integer classid);
+    //学校教师查找
+    List<Map> listSearchTeacher(@Param("usernames") String[] usernames, @Param("schoolid") Integer schoolid);
 
     //按班设置教师列表
     List<Map> listClassTeacher(@Param("classids") String classids, @Param("subjectid") String subjectid);

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

@@ -212,77 +212,84 @@ public class EBaseService {
 
     //发布考试
     @Transactional(rollbackFor = Exception.class)
-    public void updateExamStateStart(Integer examid, String examcomm, List<UserVo> students,Integer exammode) {
-        //更改考试状态
-        eBaseMapper.postExam(examid, examcomm);
-        //发布考试，获取考试试卷题量和分值
-        List<EPaper> papers = ePaperMapper.listNumAndScoreByExamId(examid);
-        List<EPaperStudent> studentList = new ArrayList<>();
-        int timestamp = N_Utils.getSecondTimestamp();
-        for (EPaper paper : papers) {
-            Integer esid = paper.getEsid();
-            Integer epid = paper.getEpid();
-            Integer pnum = paper.getPnum();
-            Double pscore = paper.getPscore();
-            String subjectid = paper.getSubjectid();
-            for (UserVo student : students) {
-                EPaperStudent es = new EPaperStudent();
-                es.setExamid(examid);
-                es.setEsid(esid);
-                es.setEpid(epid);
-                es.setSubjectid(subjectid);
-                es.setClassid(student.getClassid());
-                es.setStudentid(student.getUserid());
-                es.setSstate(0);
-                es.setChecked(0);
-                es.setNum(pnum);
-                es.setScore(pscore);
-                es.setStuscore(0.0);
-                es.setCosttime(0);
-                es.setCreatetime(timestamp);
-                es.setHasbad(0);
-                studentList.add(es);
+    public Integer updateExamStateStart(Integer examid, String examcomm, List<UserVo> students,Integer exammode) {
+        try {
+            //更改考试状态
+            eBaseMapper.postExam(examid, examcomm);
+            //发布考试，获取考试试卷题量和分值
+            List<EPaper> papers = ePaperMapper.listNumAndScoreByExamId(examid);
+            List<EPaperStudent> studentList = new ArrayList<>();
+            int timestamp = N_Utils.getSecondTimestamp();
+            for (EPaper paper : papers) {
+                Integer esid = paper.getEsid();
+                Integer epid = paper.getEpid();
+                Integer pnum = paper.getPnum();
+                Double pscore = paper.getPscore();
+                String subjectid = paper.getSubjectid();
+                for (UserVo student : students) {
+                    EPaperStudent es = new EPaperStudent();
+                    es.setExamid(examid);
+                    es.setEsid(esid);
+                    es.setEpid(epid);
+                    es.setSubjectid(subjectid);
+                    es.setClassid(student.getClassid());
+                    es.setStudentid(student.getUserid());
+                    es.setSstate(0);
+                    es.setChecked(0);
+                    es.setNum(pnum);
+                    es.setScore(pscore);
+                    es.setStuscore(0.0);
+                    es.setCosttime(0);
+                    es.setCreatetime(timestamp);
+                    es.setHasbad(0);
+                    studentList.add(es);
+                }
             }
-        }
-        ePaperStudentMapper.insertList(studentList);//保存考试学生信息
-
-        //2022-09-26线上线下统计时均需要试题，发布考试时直接把学生和试题关联上
-        //代表线下考试，生成学生和试题的关联关系
-        List<EPaperStudentQuestion> stuqlist = new ArrayList<>();
-        for (EPaper paper : papers) {
-            Integer epid = paper.getEpid();
-            //获取试卷中所有试题
-            List<EPaperQtypeQuestion> queslist = ePaperQtypeQuestionMapper.listQuestionsByEpid(epid);
-            //获取该还是卷下试题学生信息
-            List<EPaperStudent> paperstulist = studentList.stream().filter(s -> s.getEpid().equals(epid)).collect(Collectors.toList());
-            for (EPaperStudent ps : paperstulist) {
-                for(EPaperQtypeQuestion q : queslist){
-                    EPaperStudentQuestion epsq = new EPaperStudentQuestion();
-                    epsq.setClassid(ps.getClassid());
-                    epsq.setStudentid(ps.getStudentid());
-                    epsq.setExamid(ps.getExamid());
-                    epsq.setSubjectid(ps.getSubjectid());
-                    epsq.setEpid(epid);
-                    epsq.setEpsid(ps.getId());
-                    epsq.setEptqid(q.getEptqid());
-                    epsq.setCtype(q.getCtype());
-                    epsq.setQuestionid(q.getQuestionid());
-                    epsq.setQn(q.getQn());
-                    epsq.setQorder(q.getQorder());
-                    epsq.setAnswered(0);
-                    epsq.setAnswertype(0);
-                    epsq.setConverted(0);
-                    epsq.setCosttime(0);
-                    epsq.setQscore(q.getScore());
-                    epsq.setStuscore(0.0);
-                    epsq.setChecked(0);
-                    epsq.setGood(0);
-                    epsq.setBad(0);
-                    stuqlist.add(epsq);
+            ePaperStudentMapper.insertList(studentList);//保存考试学生信息
+
+            //2022-09-26线上线下统计时均需要试题，发布考试时直接把学生和试题关联上
+            //代表线下考试，生成学生和试题的关联关系
+            List<EPaperStudentQuestion> stuqlist = new ArrayList<>();
+            for (EPaper paper : papers) {
+                Integer epid = paper.getEpid();
+                //获取试卷中所有试题
+                List<EPaperQtypeQuestion> queslist = ePaperQtypeQuestionMapper.listQuestionsByEpid(epid);
+                //获取该还是卷下试题学生信息
+                List<EPaperStudent> paperstulist = studentList.stream().filter(s -> s.getEpid().equals(epid)).collect(Collectors.toList());
+                for (EPaperStudent ps : paperstulist) {
+                    for(EPaperQtypeQuestion q : queslist){
+                        EPaperStudentQuestion epsq = new EPaperStudentQuestion();
+                        epsq.setClassid(ps.getClassid());
+                        epsq.setStudentid(ps.getStudentid());
+                        epsq.setExamid(ps.getExamid());
+                        epsq.setSubjectid(ps.getSubjectid());
+                        epsq.setEpid(epid);
+                        epsq.setEpsid(ps.getId());
+                        epsq.setEptqid(q.getEptqid());
+                        epsq.setCtype(q.getCtype());
+                        epsq.setQuestionid(q.getQuestionid());
+                        epsq.setQn(q.getQn());
+                        epsq.setQorder(q.getQorder());
+                        epsq.setAnswered(0);
+                        epsq.setAnswertype(0);
+                        epsq.setConverted(0);
+                        epsq.setCosttime(0);
+                        epsq.setQscore(q.getScore());
+                        epsq.setStuscore(0.0);
+                        epsq.setChecked(0);
+                        epsq.setGood(0);
+                        epsq.setBad(0);
+                        stuqlist.add(epsq);
+                    }
                 }
             }
+            ePaperStudentQuestionMapper.insertList(stuqlist);
+        } catch (Exception e) {
+            log.error("发布考试失败："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return 1;
         }
-        ePaperStudentQuestionMapper.insertList(stuqlist);
+        return 0;
     }
 
     //结束考试

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

@@ -33,54 +33,36 @@ public class ESubjectSearchService {
     private EPaperCorrectquestionMapper ePaperCorrectquestionMapper;
 
     //查找设置
-    public List<Map> listSearchTeacher(Integer examid, Integer schoolid) {
-        List<Map> classes = eClassMapper.listByExamId(examid);
-        String classids = classes.stream().map(c -> c.get("classid").toString()).collect(Collectors.joining(","));
-        List<CTeacherVo> teachers = eClassMapper.listTeacherByClassIds(classids);//获取班级教师
-        String teacherids =
-                teachers.stream().map((CTeacherVo::getTeacherid)).map(String::valueOf).distinct().collect(Collectors.joining(","
-                ));
+    public List<Map> listSearchTeacher(Integer schoolid) {
+        List<CTeacherVo> users = eClassMapper.listTeacherBySchoolId(schoolid);//获取学校所有教师
+        String teacherids = users.stream().map(u -> u.getTeacherid().toString()).collect(Collectors.joining(","));
         List<CTeacherVo> subjects = eClassMapper.listSubjectByTeacherIds(teacherids);//获取教师科目
         String subjectids = subjects.stream().map(CTeacherVo::getSubjectid).distinct().collect(Collectors.joining("','"));
         List<CTeacherVo> subjects2 = eClassMapper.listSubjectBySubjectIds(subjectids);
-        Map<String, String> subjectNameMap = subjects2.stream().collect(Collectors.toMap(CTeacherVo::getSubjectid,
-                CTeacherVo::getSubjectname));
         Map<Integer, String> subjectMap = subjects.stream().collect(Collectors.toMap(CTeacherVo::getTeacherid,
                 CTeacherVo::getSubjectid));
-        List<CTeacherVo> users = eClassMapper.listTeacherBySchoolId(schoolid);//获取学校所有教师
-        for (CTeacherVo teacher : teachers) {
-            CTeacherVo vo = users.stream().filter(u -> u.getTeacherid().equals(teacher.getTeacherid())).findFirst().orElse(null);
-            if (vo != null) {
-                teacher.setUsername(vo.getUsername());
-                teacher.setLoginname(vo.getLoginname());
-                teacher.setUsersex(vo.getUsersex());
-            }
+        for (CTeacherVo teacher : users) {
             teacher.setSubjectid(subjectMap.get(teacher.getTeacherid()));
         }
-        for (Map cmap : classes) {
-            Integer classid = (Integer) cmap.get("classid");
-            LinkedHashMap<String, List<CTeacherVo>> scollect = teachers.stream()
-                    .filter(t -> t.getClassid().equals(classid) && t.getUsername() != null && t.getSubjectid() != null)
-                    .collect(Collectors.groupingBy(t -> t.getSubjectid(), LinkedHashMap::new, Collectors.toList()));
-            List<Map> subjectTeachers = new ArrayList<>();
-            for (Map.Entry<String, List<CTeacherVo>> entry : scollect.entrySet()) {
-                String subjectid = entry.getKey();
-                Map st = new HashMap();
-                st.put("subjectid", subjectid);
-                st.put("subjectname", subjectNameMap.get(subjectid));
-                st.put("teachers", entry.getValue());
-                subjectTeachers.add(st);
-            }
-            cmap.put("subjectTeachers", subjectTeachers);
+        List<Map> subjectTeachers = new ArrayList<>();
+        List<CTeacherVo> teachers;
+        for (CTeacherVo s : subjects2) {
+            String subjectid = s.getSubjectid();
+            teachers = users.stream().filter(u -> subjectid.equals(u.getSubjectid())).collect(Collectors.toList());
+            Map st = new HashMap();
+            st.put("subjectid", subjectid);
+            st.put("subjectname", s.getSubjectname());
+            st.put("teachers", teachers);
+            subjectTeachers.add(st);
         }
-        return classes;
+        return subjectTeachers;
     }
 
     //快捷设置
-    public Map listQuickTeacher(String username, Integer classid) {
+    public Map listQuickTeacher(String username, Integer schoolid) {
         Map map = new HashMap();
         String[] usernames = username.split("，");
-        List<Map> teachers = eClassMapper.listSearchTeacher(usernames, classid);
+        List<Map> teachers = eClassMapper.listSearchTeacher(usernames, schoolid);
         Map<String, Object> nameMap = teachers.stream().map(t-> t.get("username").toString()).distinct().collect(Collectors.toMap(t->t,t->t));
         StringBuilder sb = new StringBuilder();
         for (String name : usernames) {

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

@@ -66,12 +66,12 @@
     </update>
     <!--考试基本信息-->
     <select id="findById" resultType="java.util.Map">
-        select examid,examname,gradeid,examdate,examtype,exammode,monitored,examstate
+        select examid,examname,gradeid,examdate,examtype,exammode,monitored,examstate,showrank
         from e_base where examid=#{examid}
     </select>
     <!--考试基本信息(带考试人数)-->
     <select id="findById2" resultType="java.util.Map">
-        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid,b.exammode,b.monitored,b.examstate,b.examcomm
+        select b.examid,b.examname,b.examdate,b.examtype,b.gradeid,b.exammode,b.monitored,b.examstate,b.examcomm,showrank
         ,(select sum(c.classnum) from e_class c where c.examid=b.examid)examnum
         from e_base b where b.examid=#{examid}
     </select>

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

@@ -39,17 +39,15 @@
     <select id="listTeacherBySchoolId" resultType="com.xhkjedu.sexam.vo.exam.CTeacherVo">
         select userid teacherid,username,loginname,usersex from t_user where schoolid=#{schoolid} and usertype=1 and userstate=1
     </select>
-    <!--班级教师查找-->
+    <!--学校教师查找-->
     <select id="listSearchTeacher" resultType="java.util.Map">
-        select ct.teacherid,u.username,u.loginname,u.usersex,sb.subjectid
-        from t_class_teacher ct left join t_user u on ct.teacherid = u.userid
-        left join t_teacher_powersb tp on tp.teacherid=ct.teacherid
-        left join t_subject_book sb on tp.lsbid = sb.lsbid
-        where ct.classid=#{classid} and u.usertype=1 and u.userstate=1 and u.username in
+        select u.userid teacherid,u.username,u.loginname,u.usersex
+        from t_user u
+        where u.schoolid=#{schoolid} and u.usertype=1 and u.userstate=1 and u.username in
         <foreach collection="usernames" item="username" open="(" separator="," close=")">
             #{username}
         </foreach>
-        group by ct.teacherid
+        group by u.userid
     </select>
 
     <!--按班设置教师列表-->