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

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/ClassStudentController.java

         }
     }
 
+    @PostMapping("/list_live")
+    public ResultVo listStudentForliveclass(@RequestBody TClassStudent tClassStudent) {
+        Integer classid = tClassStudent.getClassid();
+        N_Utils.validation(new Object[]{classid, "班级id", 1,tClassStudent.getSchoolid(),"学校id",1});
+        Integer page = tClassStudent.getPage();
+        if (N_Utils.isEmptyInteger(page)) {
+            List<ClassStudentVo> list = classStudentService.listStudentForliveclass(tClassStudent);
+            return new ResultVo(0,"获取列表成功",list);
+        } else {
+            Integer pageSize = tClassStudent.getPageSize();
+            N_Utils.validation(new Object[]{pageSize, "显示条数", 1});
+            PageHelper.startPage(page, pageSize);
+            List<ClassStudentVo> list = classStudentService.listStudentForliveclass(tClassStudent);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "获取列表成功", pageResult);
+        }
+    }
+
     @PostMapping("/import_user")
     public ResultVo importUser(MultipartFile file,TClassStudent tClassStudent) {
         return classStudentService.importUser(file, tClassStudent);

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/ClassStudentMapper.java

 
     //获取学生所有提高班
     List<Integer> listTgClassid(Integer studentid);
+
+    //直播班中班级学生集合
+    List<ClassStudentVo> listStudentForliveclass(@Param("student") TClassStudent student);
 }

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassStudentService.java

         return classStudentMapper.findAll(student);
     }
 
+    //直播班中班级集合
+    public List<ClassStudentVo> listStudentForliveclass(TClassStudent student) {
+        setOrderField(student);
+        Integer year = schoolMapper.getYearById(student.getSchoolid());
+        student.setYear(year);
+        List<ClassStudentVo> rtnlst = classStudentMapper.listStudentForliveclass(student);
+        for (int i=0;i<rtnlst.size();i++){
+            ClassStudentVo cs = rtnlst.get(i);
+            String classname = cs.getClassname();
+            if (N_Utils.isNotEmpty(classname)) {
+                String[] gid_cname = classname.split("_");
+                cs.setGradeid(N_Utils.str2Int(gid_cname[0]));
+                cs.setClassname(gid_cname[1]);
+            }
+        }
+        return rtnlst;
+    }
+
     //班级学生导入
     @Transactional(rollbackFor = Exception.class)
     public ResultVo importUser(MultipartFile file, TClassStudent tClassStudent) {

suser/src/main/resources/mapper/gradeclass/ClassStudentMapper.xml

 <mapper namespace="com.xhkjedu.suser.mapper.gradeclass.ClassStudentMapper">
     <!--班级学生列表-->
     <select id="findAll" resultType="com.xhkjedu.suser.vo.gradeclass.ClassStudentVo">
-        select cs.csid,cs.classid,u.username studentname,u.studentno,u.usersex,u.userid studentid,u.loginname,cs.createtime
+        select cs.csid,cs.classid,c.classname,c.gradeid,u.username studentname,u.studentno,u.usersex,u.userid studentid,u.loginname,cs.createtime
         ,u.bindmac,u.mac,u.headpic,u.userphone,u.usertime
         from t_class_student cs left join t_user u on cs.studentid = u.userid
         left join t_class c on cs.classid=c.classid
         LEFT JOIN t_school s ON c.schoolid=s.schoolid
         WHERE cs.studentid=#{studentid} AND c.year=s.year AND c.classtype=2
     </select>
+
+    <!--直播班中学生信息-->
+    <select id="listStudentForliveclass" resultType="com.xhkjedu.suser.vo.gradeclass.ClassStudentVo">
+        select cs.csid,cs.classid,u.username studentname,u.studentno,u.usersex,u.userid studentid,u.loginname,cs.createtime
+        ,u.bindmac,u.mac,u.headpic,u.userphone,u.usertime,
+        (select concat(c2.gradeid,'_',c2.classname) from t_class_student cs2 left join t_class c2 on cs2.classid=c2.classid
+        where cs2.studentid=cs.studentid and c2.classtype=1 and c2.classstate=1 and c2.year=#{student.year} order by c2.classid desc limit 1)classname
+        from t_class_student cs left join t_user u on cs.studentid = u.userid
+        left join t_class c on cs.classid=c.classid
+        where cs.classid=#{student.classid}
+        <if test="student.studentname!=null and student.studentname!=''">
+            and (u.username like '%${student.studentname}%' or u.studentno like '%${student.studentname}%'
+            or u.loginname like '%${student.studentname}%' or u.userphone like '%${student.studentname}%')
+        </if>
+        <if test="student.fieldname!=null and student.fieldname!=''">
+            order by ${student.fieldname} ${student.fieldorder},cs.csid desc
+        </if>
+    </select>
 </mapper>