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

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

@@ -172,7 +172,7 @@ public class EBaseController {
         String examcomm = vo.getExamcomm();
         Integer createid = vo.getHandleid();
         Integer examid = vo.getExamid();
-        N_Utils.validation(new Object[]{examid, "考试id", 1, examcomm, "考试公告", 2, createid, "操作人id"});
+        N_Utils.validation(new Object[]{examid, "考试id", 1, examcomm, "考试公告", 2, createid, "操作人id", 1});
         EBaseVo exam = eBaseService.getExamStateById(examid);//根据考试id获取考试状态
         String examname = exam.getExamname();
         Integer schoolid = exam.getSchoolid();

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

@@ -56,7 +56,7 @@ public class ESubjectSearchController {
     public ResultVo listQuickTeacher(@RequestBody ESubjectInvigilate subject) {
         String username = subject.getCreatename();
         Integer classid = subject.getClassid();
-        N_Utils.validation(new Object[]{username, "姓名", 2, classid, "班级id", 1});
+        N_Utils.validation(new Object[]{username, "姓名", 2});
         Map list = eSubjectSearchService.listQuickTeacher(username, classid);
         return new ResultVo(0, "获取成功", list);
     }
@@ -93,4 +93,37 @@ public class ESubjectSearchController {
         Map map = eSubjectSearchService.listSubject(examid);
         return new ResultVo(0, "获取成功", map);
     }
+
+    /**
+     * 主监考人查找
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [base]
+     * @Author ywx
+     * @Date 2022/7/29 14:32
+     **/
+    @PostMapping("/list_zt")
+    public ResultVo listMasterTeacher(@RequestBody EBase base) {
+        Integer schoolid = base.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
+        List<Map> list = eSubjectSearchService.listMasterTeacher(schoolid);
+        return new ResultVo(0, "获取成功", list);
+    }
+
+    /**
+     * 主监考人快捷查找
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [base]
+     * @Author ywx
+     * @Date 2022/7/29 15:25
+     **/
+    @PostMapping("/list_qzt")
+    public ResultVo listQuickMasterTeacher(@RequestBody EBase base) {
+        Integer schoolid = base.getSchoolid();
+        String username = base.getCreatename();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1, username, "姓名", 2});
+        Map list = eSubjectSearchService.listQuickMasterTeacher(schoolid, username);
+        return new ResultVo(0, "获取成功", list);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/system/UserMapper.java

@@ -4,6 +4,7 @@ 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查找手机号
@@ -14,4 +15,10 @@ public interface UserMapper {
 
     //获取考试班级任教老师
     List<UserVo> listTeacherByClassIds(@Param("classids") String classids);
+
+    //主监考人查找
+    List<Map> listMasterTeacher(@Param("schoolid") Integer schoolid);
+
+    //主监考人快捷查找
+    List<Map> listQuickMasterTeacher(@Param("usernames") String[] usernames, @Param("schoolid") Integer schoolid);
 }

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

@@ -3,6 +3,7 @@ package com.xhkjedu.sexam.service.exam;
 import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
+import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.vo.exam.CTeacherVo;
 import org.springframework.stereotype.Service;
 
@@ -22,18 +23,24 @@ public class ESubjectSearchService {
     private EBaseMapper eBaseMapper;
     @Resource
     private ESubjectMapper eSubjectMapper;
+    @Resource
+    private UserMapper userMapper;
 
     //查找设置
     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(","));
+        String teacherids =
+                teachers.stream().map((CTeacherVo::getTeacherid)).map(String::valueOf).distinct().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));
+        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);
@@ -68,7 +75,8 @@ public class ESubjectSearchService {
         Map map = new HashMap();
         String[] usernames = username.split("，");
         List<Map> teachers = eClassMapper.listSearchTeacher(usernames, classid);
-        Map<String, Object> nameMap = teachers.stream().collect(Collectors.toMap(t -> t.get("username").toString(), t -> t.get("teacherid")));
+        Map<String, Object> nameMap = teachers.stream().collect(Collectors.toMap(t -> t.get("username").toString(), t -> t.get(
+                "teacherid")));
         StringBuilder sb = new StringBuilder();
         for (String name : usernames) {
             if (nameMap.get(name) == null) {
@@ -99,4 +107,28 @@ public class ESubjectSearchService {
         map.put("subjects", subjects);
         return map;
     }
+
+    //主监考人查找
+    public List<Map> listMasterTeacher(Integer schoolid) {
+        return userMapper.listMasterTeacher(schoolid);
+    }
+
+    //主监考人快捷查找
+    public Map listQuickMasterTeacher(Integer schoolid, String username) {
+        Map map = new HashMap();
+        String[] usernames = username.split("，");
+        List<Map> teachers = userMapper.listQuickMasterTeacher(usernames, schoolid);
+        Map<String, Object> nameMap = teachers.stream().collect(Collectors.toMap(t -> t.get("username").toString(), t -> t.get(
+                "teacherid")));
+        StringBuilder sb = new StringBuilder();
+        for (String name : usernames) {
+            if (nameMap.get(name) == null) {
+                sb.append(name).append("，");
+            }
+        }
+        map.put("teachers", teachers);//匹配的教师
+        String notExist = sb.toString();//未匹配的教师
+        map.put("notExist", notExist.substring(0, notExist.length() - 1));
+        return map;
+    }
 }

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

@@ -40,12 +40,15 @@
     </select>
     <!--班级教师查找-->
     <select id="listSearchTeacher" resultType="java.util.Map">
-        select ct.teacherid,u.username
+        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
         <foreach collection="usernames" item="username" open="(" separator="," close=")">
             #{username}
         </foreach>
+        group by ct.teacherid
     </select>
 
     <!--按班设置教师列表-->

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

@@ -4,22 +4,25 @@
     <!--待阅卷列表-->
     <select id="listPending" resultType="java.util.Map">
         select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
-        ,truncate(count(case when ps.sstate=2 and ps.checked=2 then ps.epsid else null end)*100/
-                  count(case when ps.sstate=2 then ps.epsid else null end),2)pgrate
+        ,truncate(a.pynum*100/a.tjnum,2)pgrate
         from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
         ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(pc.classid)classids
+        ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
+        ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
         left join e_paper_correctclass pc on p.epid = pc.epid
+        left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
         where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15)
         union
         select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
         ,group_concat(distinct pq.qorder order by pq.qorder)qorders,0 classids
+        ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
+        ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
+        left join e_paper_student_question psq on psq.epid = pq.epid and psq.qorder=pq.qorder
         where pq.teacherid=#{teacherid})a left join e_subject es on a.esid = es.esid
         left join e_base eb on es.examid = eb.examid
-        left join e_paper_student ps on a.epid=ps.epid
-        group by a.epid
-        having count(case when ps.checked!=2 then ps.epsid else null end)>0
+        where a.tjnum!=a.pynum group by a.epid
     </select>
     <!--已阅卷列表-->
     <select id="listMarked" resultType="java.util.Map">

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

@@ -22,4 +22,23 @@
         where ct.classid in(${classids}) and u.userstate=1
         group by u.userid
     </select>
+    <!--主监考人查找-->
+    <select id="listMasterTeacher" resultType="java.util.Map">
+        select u.userid teacherid,u.username,u.loginname,u.usersex,sb.subjectid
+        from t_user u left join t_teacher_powersb tp on tp.teacherid=u.userid
+        left join t_subject_book sb on tp.lsbid = sb.lsbid
+        where u.schoolid=#{schoolid} and u.usertype=1 and u.userstate=1
+        group by u.userid
+    </select>
+    <!--主监考人快捷查找-->
+    <select id="listQuickMasterTeacher" resultType="java.util.Map">
+        select u.userid teacherid,u.username,u.loginname,u.usersex,sb.subjectid
+        from t_user u left join t_teacher_powersb tp on tp.teacherid=u.userid
+        left join t_subject_book sb on tp.lsbid = sb.lsbid
+        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 u.userid
+    </select>
 </mapper>