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

slive/src/main/java/com/xhkjedu/slive/mapper/xz/XzMapper.java

 
     //根据课节id获取行政直播详情
     LXz getXzByXzkjid(@Param("kjid") Integer kjid);
+
+    //修改课程表操作步骤
+    void updateCurstepByXzid(@Param("curstep") Integer curstep,@Param("xzid") Integer xzid);
 }

slive/src/main/java/com/xhkjedu/slive/model/xz/LXz.java

     //是否删除1正常10已删除
     private Integer deleted;
 
+    //当前步骤：1基础信息2课程表3设置完成
+    private Integer curstep;
+
     //创建人
     private Integer createid;
 

slive/src/main/java/com/xhkjedu/slive/service/xz/XzService.java

             Integer timestamp = N_Utils.getSecondTimestamp();
             xz.setCreatetime(timestamp);
             xz.setDeleted(1);
+            xz.setCurstep(2);
             xzMapper.insertUseGeneratedKeys(xz);//保存行政直播信息
             Integer xzid = xz.getId();
             //保存对应的课节信息
                         }
                     }
                 }
+
+                //保存完课程表之后修改当前步骤
+                xzMapper.updateCurstepByXzid(3,xz.getXzid());
+
                 return new ResultVo(0, "保存行政直播课程表成功");
             }
         } catch (Exception e) {

slive/src/main/resources/mapper/xz/XzMapper.xml

     <select id="getXzByXzkjid" resultType="com.xhkjedu.slive.model.xz.LXz">
         select x.* from l_xz x left join l_xz_kj k on x.xzid=k.xzid where kjid=#{kjid} group by xzid
     </select>
+
+    <!--修改课程表操作步骤-->
+    <update id="updateCurstepByXzid">
+        update l_xz set curstep=#{curstep} where xzid=#{xzid}
+    </update>
 </mapper>

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();
-        Integer year = classStudentService.getSchoolyear(tClassStudent.getSchoolid());
-        tClassStudent.setYear(year);
-        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 Integer getSchoolyear(Integer schoolid){
-        return schoolMapper.getYearById(schoolid);
-    }
-
-    //直播班中班级集合
-    public List<ClassStudentVo> listStudentForliveclass(TClassStudent student) {
-        setOrderField(student);
-        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

         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 distinct 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>