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

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

@@ -37,7 +37,11 @@ public class ESubjectSearchService {
         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());
+            if (vo != null) {
+                teacher.setUsername(vo.getUsername());
+                teacher.setLoginname(vo.getLoginname());
+                teacher.setUsersex(vo.getUsersex());
+            }
             teacher.setSubjectid(subjectMap.get(teacher.getTeacherid()));
         }
         for (Map cmap : classes) {

sexam/src/main/java/com/xhkjedu/sexam/vo/exam/CTeacherVo.java

@@ -16,6 +16,12 @@ public class CTeacherVo {
     //教师姓名
     private String username;
 
+    //登录账号
+    private String loginname;
+
+    //性别0未知1男2女
+    private Integer usersex;
+
     //科目id
     private String subjectid;
 

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

@@ -21,10 +21,7 @@
 
     <!--获取班级教师-->
     <select id="listTeacherByClassIds" resultType="com.xhkjedu.sexam.vo.exam.CTeacherVo">
-        select ct.classid,ct.teacherid,u.userphone
-        from t_class_teacher ct left join t_user u on ct.teacherid = u.userid
-        where ct.classid in(${classids}) and u.userstate=1
-        group by ct.teacherid
+        select ct.classid,ct.teacherid from t_class_teacher ct where ct.classid in(${classids})
     </select>
     <!--获取教师科目-->
     <select id="listSubjectByTeacherIds" resultType="com.xhkjedu.sexam.vo.exam.CTeacherVo">
@@ -39,7 +36,7 @@
     </select>
     <!--获取学校所有教师-->
     <select id="listTeacherBySchoolId" resultType="com.xhkjedu.sexam.vo.exam.CTeacherVo">
-        select userid teacherid,username from t_user where schoolid=#{schoolid} and usertype=1 and userstate=1
+        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">
@@ -53,7 +50,7 @@
 
     <!--按班设置教师列表-->
     <select id="listClassTeacher" resultType="java.util.Map">
-        select ct.classid,ct.teacherid,u.username
+        select ct.classid,ct.teacherid,u.username,u.loginname,u.usersex
         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