Merge remote-tracking branch 'origin/wn' into ywx

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

@@ -54,9 +54,9 @@ public class ESubjectSearchController {
     @PostMapping("/list_qt")
     public ResultVo listQuickTeacher(@RequestBody EBase subject) {
         String username = subject.getCreatename();
-        Integer schoolid = subject.getSchoolid();
-        N_Utils.validation(new Object[]{username, "姓名", 2, schoolid, "学校id", 1});
-        Map list = eSubjectSearchService.listQuickTeacher(username, schoolid);
+        Integer examid = subject.getExamid();
+        N_Utils.validation(new Object[]{username, "姓名", 2, examid, "考试id", 1});
+        Map list = eSubjectSearchService.listQuickTeacher(username, examid);
         return new ResultVo(0, "获取成功", list);
     }
 

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

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

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

@@ -85,7 +85,7 @@ public class ESubjectInvigilateService {
             }
             //关闭引用检测，避免循环给classes赋值出现"$ref":"$[0]"现象
             String str = JSON.toJSONString(schoolClasses, SerializerFeature.DisableCircularReferenceDetect);
-            s.put("classes", JSON.parseArray(str, Map.class));
+            s.put("schools", JSON.parseArray(str, Map.class));
         }
         map.put("subjects", subjects);
         return map;

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

@@ -59,10 +59,10 @@ public class ESubjectSearchService {
     }
 
     // 快捷设置
-    public Map listQuickTeacher(String username, Integer schoolid) {
+    public Map listQuickTeacher(String username, Integer examid) {
         Map map = new HashMap();
         String[] usernames = username.split("，");
-        List<Map> teachers = eClassMapper.listSearchTeacher(usernames, schoolid);
+        List<Map> teachers = eClassMapper.listSearchTeacher(usernames, examid);
         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

@@ -13,7 +13,7 @@
     <!--考试列表-->
     <select id="listAll" resultType="java.util.Map">
         select b.examid,b.examname,b.examdate,b.gradeid,b.examtype,b.exammode,b.monitored,b.teashowrank,b.stushowrank
-        ,b.examstate,u.username createname,group_concat(distinct es.subjectname order by es.esid separator '|')subjectname
+        ,b.examstate,u.username createname,b.hashb,group_concat(distinct es.subjectname order by es.esid separator '|')subjectname
         ,count(distinct case when es.begintime is null or es.begintime='' then es.esid else null end)esnum
         ,min(es.esstate)esstate,min(es.pstate)pstate,min(ifnull(ep.correcttype,0))correcttype
         ,(case when b.exammode=1 then (count(distinct es.esid)-count(distinct ei.esid))

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

@@ -45,8 +45,8 @@
     <!--学校教师查找-->
     <select id="listSearchTeacher" resultType="java.util.Map">
         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
+        from t_user u left join e_class s on u.schoolid=s.schoolid
+        where s.examid=#{examid} and u.usertype=1 and u.userstate=1 and u.username in
         <foreach collection="usernames" item="username" open="(" separator="," close=")">
             #{username}
         </foreach>