修改课程回顾详情排序，课程表删除单个单元格

sclass/src/main/resources/mapper/classroom/ClassroomMapper.xml

@@ -36,7 +36,7 @@
         ,sum(case when s.radiocorrect!=0 then 1 else 0 end)correctnum
         from t_classroom_askstudent s left join t_classroom_askteacher rt on s.asktid=rt.asktid
         where rt.roomid=#{roomid} and rt.asktype between 32 and 33
-        group by s.asktid
+        group by s.asktid order by rt.createtime
     </select>
     <select id="listExam" resultType="com.xhkjedu.sclass.vo.classroom.RoomCorrectExamVo">
         select s.paperid,p.papername,count(*)commitnum,count(*) stunum
@@ -44,7 +44,7 @@
         from t_classroom_paper_student s left join t_classroom_paper p on s.paperid=p.paperid
         left join t_classroom_askteacher rt on s.paperid=rt.paperid
         where rt.roomid=#{roomid} and rt.asktype=40
-        group by s.paperid
+        group by s.paperid order by p.createtime
     </select>
     <select id="listCorrect" resultMap="correctResult">
         select r.roomid,r.roomname,r.createtime,r.endtime,r.realstunum
@@ -77,7 +77,7 @@
         left join t_classroom_askteacher rt on rs.asktid=rt.asktid
         left join t_classroom_askstudent rs2 on rs2.asktid=rs.asktid
         where rs.asktid=#{asktid}
-        group by rs.asksid
+        group by rs.asksid order by rs.studentid
     </select>
     <!--获取考试批改学生列表-->
     <select id="listStudentsByPaperId" resultMap="checkResult">
@@ -87,7 +87,7 @@
         from t_classroom_paper_student ps left join t_user u on ps.studentid=u.userid
         left join t_classroom_paper_student ps2 on ps2.paperid=ps.paperid
         where ps.paperid=#{paperid}
-        group by ps.psid
+        group by ps.psid order by ps.studentid
     </select>
 
     <resultMap id="objectiveResult" type="com.xhkjedu.sclass.vo.classroom.ObjectiveVo">
@@ -218,7 +218,7 @@
         from t_classroom_askstudent s1 where s1.asktid=rt.asktid)correctrate
         from t_classroom_askstudent s right join t_classroom_askteacher rt on s.asktid=rt.asktid and s.studentid=#{studentid}
         where rt.roomid=#{roomid} and rt.asktype between 30 and 33
-        group by rt.asktid
+        group by rt.asktid order by rt.createtime
     </select>
     <select id="listStuAsk" resultType="java.util.Map">
         select a.asktype,a.fqnum,a.cynum,truncate(a.cynum*100/a.fqnum,2)cyrate
@@ -258,7 +258,7 @@
         left join t_classroom_paper_student s on s.paperid=p.paperid
         left join t_classroom_paper_student s1 on s1.paperid=rt.paperid and s1.studentid=#{studentid}
         where rt.roomid=#{roomid} and rt.asktype=40 and p.paperid is not null
-        group by p.paperid
+        group by p.paperid order by p.createtime
     </select>
     <select id="listStuEQuestion" resultType="java.util.Map">
         select
@@ -384,7 +384,7 @@
         LEFT JOIN t_classroom_paper_student ps ON p.paperid=ps.paperid
         LEFT JOIN t_classroom_askteacher rt ON p.paperid=rt.paperid
         LEFT JOIN t_classroom c ON rt.roomid=c.roomid
-        WHERE c.roomid=#{roomid} GROUP BY p.paperid
+        WHERE c.roomid=#{roomid} GROUP BY p.paperid order by p.createtime
     </select>
 
     <!--班级学生列表-->

slive/src/main/java/com/xhkjedu/slive/controller/xz/XzController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.slive.model.xz.LXz;
 import com.xhkjedu.slive.service.xz.XzService;
+import com.xhkjedu.slive.vo.xz.XzDateKjTeaVo;
 import com.xhkjedu.slive.vo.xz.XzDateVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
@@ -107,6 +108,21 @@ public class XzController {
         return new ResultVo(0, "删除成功");
     }
 
+    /**
+     * @Description 获取行政直播课程表
+     * @Param [xz]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/4/1 13:57
+     **/
+    @PostMapping("/xzkb")
+    public ResultVo getXzKjDetail(@RequestBody LXz xz){
+        N_Utils.validation(new Object[]{xz.getXzid(),"行政直播id",1});
+        Map rtnmap = xzService.getXzKjDetail(xz);
+        return new ResultVo(0, "成功获取行政直播课程表",rtnmap);
+    }
+
+
     /**
      * @Description  保存行政直播课程表
      * @Param [xz]
@@ -114,24 +130,24 @@ public class XzController {
      * @Author wn
      * @Date 2022/4/1 9:41
      **/
-    @PostMapping("/sxzk")
+    @PostMapping("/kcbs")
     public ResultVo saveXzCourse(@RequestBody LXz xz){
         N_Utils.validation(new Object[]{xz.getXzid(),"行政直播id",1});
         return xzService.saveXzCourse(xz);
     }
 
     /**
-     * @Description 获取行政直播课程表
-     * @Param [xz]
+     * @Description 删除课程表单个单元格数据
+     * @Param [kjTeaVo]
      * @Return com.xhkjedu.vo.ResultVo
      * @Author wn
-     * @Date 2022/4/1 13:57
+     * @Date 2022/4/1 17:52
      **/
-    @PostMapping("/xzkb")
-    public ResultVo getXzKjDetail(@RequestBody LXz xz){
-        N_Utils.validation(new Object[]{xz.getXzid(),"行政直播id",1});
-        Map rtnmap = xzService.getXzKjDetail(xz);
-        return new ResultVo(0, "成功获取行政直播课程表",rtnmap);
+    @PostMapping("/kcbd")
+    public ResultVo delXzkjDyg(@RequestBody XzDateKjTeaVo kjTeaVo){
+        N_Utils.validation(new Object[]{kjTeaVo.getCourseid(),"课程id",1,kjTeaVo.getClassid(),"班级id",1});
+        xzService.delXzkjDyg(kjTeaVo);
+        return new ResultVo(0, "成功删除单个课程信息");
     }
 
 }

slive/src/main/java/com/xhkjedu/slive/controller/xz/XzKjController.java

@@ -2,6 +2,7 @@ package com.xhkjedu.slive.controller.xz;
 
 import com.xhkjedu.slive.model.xz.LXzKj;
 import com.xhkjedu.slive.service.xz.XzKjService;
+import com.xhkjedu.slive.vo.xz.XzDateKjVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description 行政直播课节详情
@@ -27,8 +27,8 @@ public class XzKjController {
     @PostMapping("/kjs")
     public ResultVo listKjsByXzid(@RequestBody LXzKj kj){
         N_Utils.validation(new Object[]{kj.getXzid(),"行政直播id",1});
-        List<Map> map = xzKjService.listXzKjsByXzid(kj.getXzid());
-        return new ResultVo(0,"成功获取行政直播课节详情",map);
+        List<XzDateKjVo> rtn = xzKjService.listXzKjsByXzid(kj.getXzid());
+        return new ResultVo(0,"成功获取行政直播课节详情",rtn);
     }
 
     /**

slive/src/main/java/com/xhkjedu/slive/mapper/gradeclass/ClassMapper.java

@@ -28,4 +28,7 @@ public interface ClassMapper extends TkMapper<TClass> {
 
     //获取班级当前年份
     Integer getYearById(Integer classid);
+
+    //删除班级学生及分组学生
+    void deleteClassstu(@Param("zbclassid") Integer zbclassid, @Param("classid")Integer classid);
 }

slive/src/main/java/com/xhkjedu/slive/mapper/liveplay/CourseClassMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.slive.mapper.liveplay;
 
 import com.xhkjedu.slive.base.TkMapper;
 import com.xhkjedu.slive.model.liveplay.LCourseClass;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -13,4 +14,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface CourseClassMapper extends TkMapper<LCourseClass> {
 
+    //获取课程关联指定班级外的其他班级数量
+    Integer getOtherClassnumByCourseid(@Param("courseid")Integer courseid,@Param("classid")Integer classid);
+
+    //根据课程id和班级id删除关联关系
+    void deleteByCourseidAndClassid(@Param("courseid")Integer courseid,@Param("classid")Integer classid);
 }

slive/src/main/java/com/xhkjedu/slive/mapper/liveplay/CourseMapper.java

@@ -102,4 +102,6 @@ public interface CourseMapper extends TkMapper<LCourse> {
     void updateCoursename(@Param("course") LCourse course);
     //修改课程课节备注
     void updateCoursecomm(@Param("course") LCourse course);
+    //根据课程id删除关联课程关联信息
+    void deleteCourseClassByCourseid(@Param("courseid") Integer courseid);
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.slive.mapper.xz;
 
 import com.xhkjedu.slive.base.TkMapper;
 import com.xhkjedu.slive.model.xz.LXzKj;
+import com.xhkjedu.slive.vo.xz.XzDateKjVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -17,7 +18,7 @@ import java.util.Map;
 public interface XzKjMapper extends TkMapper<LXzKj> {
 
     //获取行政直播课节详情
-    List<Map> listXzKjsByXzid(@Param("xzid") Integer xzid);
+    List<XzDateKjVo> listXzKjsByXzid(@Param("xzid") Integer xzid);
 
     //批量修改行政直播课节详情
     void updateBatchXzKj(@Param("list") List<LXzKj> list);

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

@@ -20,7 +20,7 @@ public interface XzMapper extends TkMapper<LXz> {
     //行政直播列表
     List<Map> listXzs(@Param("xz") LXz xz);
 
-    //行政直播下进行中或已结束的课节数量
+    //行政直播课对应的课程已开课数量
     Integer getXzSectionKsNum(@Param("xzid") Integer xzid);
 
     //删除行政直播下所有的直播课程和直播班级

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

@@ -2,13 +2,13 @@ package com.xhkjedu.slive.service.xz;
 
 import com.xhkjedu.slive.mapper.xz.XzKjMapper;
 import com.xhkjedu.slive.model.xz.LXzKj;
+import com.xhkjedu.slive.vo.xz.XzDateKjVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description 行政直播课节
@@ -23,11 +23,10 @@ public class XzKjService {
     /**
      * @Description  获取行政直播课节基本信息
      * @Param [xzid]
-     * @Return com.xhkjedu.vo.ResultVo
      * @Author wn
      * @Date 2022/3/31 14:07
      **/
-    public List<Map> listXzKjsByXzid(Integer xzid) {
+    public List<XzDateKjVo> listXzKjsByXzid(Integer xzid) {
         return xzKjMapper.listXzKjsByXzid(xzid);
     }
 

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.slive.service.xz;
 
+import com.xhkjedu.slive.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.slive.mapper.gradeclass.ClassTeacherMapper;
 import com.xhkjedu.slive.mapper.gradeclass.SchoolMapper;
 import com.xhkjedu.slive.mapper.liveplay.CourseClassMapper;
@@ -18,8 +19,8 @@ import com.xhkjedu.slive.service.gradeclass.ClassService;
 import com.xhkjedu.slive.utils.LiveUtil;
 import com.xhkjedu.slive.vo.gradeclass.ClassVo;
 import com.xhkjedu.slive.vo.xz.XzDateVo;
-import com.xhkjedu.slive.vo.xz.XzDateXjTeaVo;
-import com.xhkjedu.slive.vo.xz.XzDateXjVo;
+import com.xhkjedu.slive.vo.xz.XzDateKjTeaVo;
+import com.xhkjedu.slive.vo.xz.XzDateKjVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
@@ -58,6 +59,8 @@ public class XzService {
     private ClassService classService;
     @Resource
     private ClassTeacherMapper classTeacherMapper;
+    @Resource
+    private ClassMapper classMapper;
 
     /**
      * @Description 行政直播列表
@@ -91,7 +94,7 @@ public class XzService {
             kj.setXzid(xzid);
             String kjname = LiveUtil.getChineStrByNum(i);
             kj.setKjname("第" + kjname + "节");
-            kj.setKjorder(i+1);
+            kj.setKjorder(i + 1);
             kj.setCreateid(xz.getCreateid());
             kj.setCreatetime(timestamp);
 
@@ -145,13 +148,14 @@ public class XzService {
                 xzMapper.deleteCourseClassByXzid(xzid);
                 xzMapper.deleteXzAndKjByXzid(xzid);
             }
-        }catch (Exception e){
-            log.error("删除行政直播出错："+e.getMessage());
+        } catch (Exception e) {
+            log.error("删除行政直播出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
 
 
     }
+
     /**
      * @Description 保存行政直播课程表
      * @Param [xzDatelst]
@@ -168,14 +172,14 @@ public class XzService {
             //日期下的课节情况
             XzDateVo xzDateVo = xzDatelst.get(i);
             String datazhou = LiveUtil.getDateZhou(xzDateVo.getSelectdate());//要保存日期对应的周
-            List<XzDateXjVo> dateKjlst = xzDateVo.getKjs();//指定日期下课节情况
+            List<XzDateKjVo> dateKjlst = xzDateVo.getKjs();//指定日期下课节情况
 
             for (int j = 0; j < dateKjlst.size(); j++) {
                 //单课节情况
-                XzDateXjVo dateKjVo = dateKjlst.get(j);
-                List<XzDateXjTeaVo> xjTealst = dateKjVo.getKjteas();//单课节下各班级情况
+                XzDateKjVo dateKjVo = dateKjlst.get(j);
+                List<XzDateKjTeaVo> xjTealst = dateKjVo.getKjteas();//单课节下各班级情况
                 //处理成教师下班级形式，生成课程
-                Map<Integer, List<XzDateXjTeaVo>> map = listChangeTeacherClass(xjTealst);
+                Map<Integer, List<XzDateKjTeaVo>> map = listChangeTeacherClass(xjTealst);
                 LCourse course = new LCourse();
                 course.setGradeid(x.getGradeid());
                 course.setBegindate(xzDateVo.getSelectdate());
@@ -189,11 +193,12 @@ public class XzService {
                 course.setCreatetime(N_Utils.getSecondTimestamp());
                 course.setSchoolid(x.getSchoolid());
 
-                for(Map.Entry<Integer, List<XzDateXjTeaVo>> entry : map.entrySet()){
-                    List<XzDateXjTeaVo> xjTeas = entry.getValue();
+                for (Map.Entry<Integer, List<XzDateKjTeaVo>> entry : map.entrySet()) {
+                    List<XzDateKjTeaVo> xjTeas = entry.getValue();
                     String teachername = xjTeas.get(0).getTeachername();
                     //单个教师课程信息
-                    String coursename = datazhou + dateKjVo.getKjname() +xjTeas.get(0).getSubjectname()+ "("+ teachername +")";
+                    String coursename =
+                            datazhou + dateKjVo.getKjname() + xjTeas.get(0).getSubjectname() + "(" + teachername + ")";
 
                     course.setCoursename(coursename);
                     course.setSubjectid(xjTeas.get(0).getSubjectid());
@@ -202,7 +207,7 @@ public class XzService {
                     course.setEndtime(dateKjVo.getEndtime());
                     course.setKjid(dateKjVo.getKjid());
                     //保存行政直播课程表
-                    saveCourseAll(xjTeas,course);
+                    saveCourseAll(xjTeas, course);
                 }
             }
         }
@@ -210,17 +215,19 @@ public class XzService {
     }
 
     //指定天某天某节课下的教师班级层级关系
-    private Map<Integer, List<XzDateXjTeaVo>> listChangeTeacherClass(List<XzDateXjTeaVo> xjTealst) {
-        Map<Integer, List<XzDateXjTeaVo>> map = new HashMap<>();
+    private Map<Integer, List<XzDateKjTeaVo>> listChangeTeacherClass(List<XzDateKjTeaVo> xjTealst) {
+        Map<Integer, List<XzDateKjTeaVo>> map = new HashMap<>();
 
         for (int i = 0; i < xjTealst.size(); i++) {
-            XzDateXjTeaVo xzDateXjTeaVo = xjTealst.get(i);
-            if (map.containsKey(xzDateXjTeaVo.getTeacherid())) {
-                map.get(xzDateXjTeaVo.getTeacherid()).add(xzDateXjTeaVo);
-            } else {
-                List<XzDateXjTeaVo> classlst = new ArrayList<>();
-                classlst.add(xzDateXjTeaVo);
-                map.put(xzDateXjTeaVo.getTeacherid(), classlst);
+            XzDateKjTeaVo xzDateXjTeaVo = xjTealst.get(i);
+            if (!N_Utils.isEmptyInteger(xzDateXjTeaVo.getTeacherid())) {
+                if (map.containsKey(xzDateXjTeaVo.getTeacherid())) {
+                    map.get(xzDateXjTeaVo.getTeacherid()).add(xzDateXjTeaVo);
+                } else {
+                    List<XzDateKjTeaVo> classlst = new ArrayList<>();
+                    classlst.add(xzDateXjTeaVo);
+                    map.put(xzDateXjTeaVo.getTeacherid(), classlst);
+                }
             }
         }
         return map;
@@ -228,10 +235,10 @@ public class XzService {
 
     //保存行政直播课程表
     @Transactional(rollbackFor = Exception.class)
-    public void saveCourseAll(List<XzDateXjTeaVo> xjTeas,LCourse course){
+    public void saveCourseAll(List<XzDateKjTeaVo> xjTeas, LCourse course) {
         try {
             //获取集合中所有的班级id
-            List classidlst = xjTeas.stream().map(XzDateXjTeaVo::getClassid).collect(Collectors.toList());
+            List classidlst = xjTeas.stream().map(XzDateKjTeaVo::getClassid).collect(Collectors.toList());
             List<Map> users = courseMapper.listUid(classidlst);//获取课班级下学生
 
             //新生成直播班班级信息
@@ -273,7 +280,7 @@ public class XzService {
 
             //保存直播关联班级
             List<LCourseClass> cclist = new ArrayList<>();
-            for(int i=0;i<classidlst.size();i++){
+            for (int i = 0; i < classidlst.size(); i++) {
                 Integer cid = Integer.parseInt(classidlst.get(i).toString());
                 LCourseClass cc = new LCourseClass();
                 cc.setCourseid(courseid);
@@ -287,9 +294,6 @@ public class XzService {
             }
             courseClassMapper.insertList(cclist);//保存原班级和直播的关联关系
 
-            //获取班级人数
-            ClassVo classVo = classService.getById(classid);
-
             //保存课程课节关联关系
             LCourseSection cs = new LCourseSection();
             cs.setCourseid(courseid);
@@ -299,14 +303,14 @@ public class XzService {
             cs.setSectiondate(course.getBegindate());
             cs.setPlanbegintime(course.getBegintime());
             cs.setPlanendtime(course.getEndtime());
-            cs.setStunum(classVo.getClassnum());
+            cs.setStunum(0);
             cs.setSectionstate(0);
             cs.setCreateid(course.getCreateid());
             cs.setCreatetime(course.getCreatetime());
             courseSectionMapper.insertUseGeneratedKeys(cs);//保存课程课节信息
 
-        }catch (Exception e){
-            log.info("保存行政直播课程表出错："+e.getMessage());
+        } catch (Exception e) {
+            log.info("保存行政直播课程表出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
     }
@@ -319,12 +323,49 @@ public class XzService {
      * @Date 2022/4/1 13:59
      **/
     public Map getXzKjDetail(LXz xz) {
-        if(N_Utils.isNotEmpty(xz.getBegindate())){
-            xz.setEnddate(LiveUtil.getSelectDateAfter(xz.getBegindate(),6));
+        if (N_Utils.isNotEmpty(xz.getBegindate())) {
+            xz.setEnddate(LiveUtil.getSelectDateAfter(xz.getBegindate(), 6));
         }
         //先获取课程基本信息
         Map map = xzMapper.getXzForRtn(xz.getXzid());
-        map.put("xzdates",xzMapper.listXzKjDetail(xz));
+        map.put("xzdates", xzMapper.listXzKjDetail(xz));
         return map;
     }
+
+    /**
+     * @Description 删除单个单元格
+     * @Param [kjTeaVo]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/4/1 17:42
+     **/
+    @Transactional
+    public ResultVo delXzkjDyg(XzDateKjTeaVo kjTeaVo) {
+        try {
+            //判断课程的状态，如果已经开始上课则不能删除
+            LCourse course = courseMapper.selectByPrimaryKey(kjTeaVo.getCourseid());
+            if (course.getCoursestate() > 0) {
+                return new ResultVo(1,"选择的课程已经开始上课，不允许删除");
+            } else {
+                //删除单个单元格中设置的教师信息，先判断该单元格对应的课程是否有其他班级
+                Integer coursenum = courseClassMapper.getOtherClassnumByCourseid(kjTeaVo.getCourseid(), kjTeaVo.getClassid());
+                if (coursenum == 0) {
+                    //说明该课程仅关联一个班级,直接删除该课程以及该课程对应的直播班
+                    courseMapper.deleteCourseClassByCourseid(kjTeaVo.getCourseid());
+                } else {
+                    //说明关联的还有其他班级,删除该班级在直播班级中的学生，
+                    courseClassMapper.deleteByCourseidAndClassid(kjTeaVo.getCourseid(),kjTeaVo.getClassid());
+                    //处理对应直播班级中学生
+                    classMapper.deleteClassstu(course.getClassid(),kjTeaVo.getClassid());
+                    classMapper.updateNum2(course.getClassid());//更改班级以及班级分组人数
+                    courseMapper.updateStuNum(kjTeaVo.getCourseid());//更新直播课学生数量
+                }
+            }
+            return new ResultVo(0,"成功删除课程表单个课程");
+        }catch (Exception e){
+            log.error("删除课程表单个课程出错："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new ResultVo(1,"删除课程表单个课程失败");
+        }
+    }
 }

slive/src/main/java/com/xhkjedu/slive/vo/xz/XzDateXjTeaVo.java → slive/src/main/java/com/xhkjedu/slive/vo/xz/XzDateKjTeaVo.java

@@ -10,7 +10,7 @@ import java.util.List;
  * Date 2022/3/31 10:04
  **/
 @Data
-public class XzDateXjTeaVo {
+public class XzDateKjTeaVo {
 
     private Integer classid;//班级id
     private String classname;//班级名称
@@ -21,5 +21,5 @@ public class XzDateXjTeaVo {
     private String subjectid;//科目id
     private String subjectname;//科目名称
 
-    private List<XzDateXjTeaVo> xjclass;//存放层级用于保存时使用
+    private List<XzDateKjTeaVo> xjclass;//存放层级用于保存时使用
 }

slive/src/main/java/com/xhkjedu/slive/vo/xz/XzDateXjVo.java → slive/src/main/java/com/xhkjedu/slive/vo/xz/XzDateKjVo.java

@@ -10,12 +10,12 @@ import java.util.List;
  * Date 2022/3/31 10:04
  **/
 @Data
-public class XzDateXjVo {
+public class XzDateKjVo {
     private Integer kjid;//行政课节id
     private String kjname;//课节名称
     private Integer kjorder;//课节排序
     private String begintime;//开始时间
     private String endtime;//结束时间
-    private List<XzDateXjTeaVo> kjteas;//指定日期下课节下所有的直播课
+    private List<XzDateKjTeaVo> kjteas;//指定日期下课节下所有的直播课
 
 }

slive/src/main/java/com/xhkjedu/slive/vo/xz/XzDateVo.java

@@ -2,7 +2,6 @@ package com.xhkjedu.slive.vo.xz;
 
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -13,7 +12,7 @@ import java.util.List;
 @Data
 public class XzDateVo {
     private String selectdate;//当前选择日期
-    private List<XzDateXjVo> kjs;//行政直播课节集合
+    private List<XzDateKjVo> kjs;//行政直播课节集合
 
 
 }

slive/src/main/resources/mapper/gradeclass/ClassMapper.xml

@@ -40,4 +40,12 @@
     <select id="getYearById" resultType="java.lang.Integer">
         select year from t_class where classid=#{classid}
     </select>
+
+    <!--删除班级学生及分组学生-->
+    <delete id="deleteClassstu">
+        delete cs.*,gs.* from t_class_student cs
+        left join t_class_student cs2 on cs.studentid=cs2.studentid
+        left join t_group_student gs on cs.classid=gs.classid and cs.studentid=gs.studentid
+        where cs.classid=#{zbclassid} and cs2.classid=#{classid} and cs.xzed=0
+    </delete>
 </mapper>

slive/src/main/resources/mapper/liveplay/CourseClassMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.slive.mapper.liveplay.CourseClassMapper">
+
+    <!--获取课程关联指定班级外的其他班级数量-->
+    <select id="getOtherClassnumByCourseid" resultType="java.lang.Integer">
+        select count(*) from l_course_class where courseid=#{courseid} and classid!=#{classid}
+    </select>
+
+    <!--根据课程id和班级id删除关联关系-->
+    <delete id="deleteByCourseidAndClassid">
+        delete from l_course_class where courseid=#{courseid} and classid=#{classid}
+    </delete>
+</mapper>

slive/src/main/resources/mapper/liveplay/CourseMapper.xml

@@ -18,7 +18,7 @@
         <if test="course.classid!=null and course.classid!=0">
             left join l_course_class cc on cc.courseid=c.courseid
         </if>
-        where c.schoolid=#{course.schoolid} and c.deleted=1
+        where c.schoolid=#{course.schoolid} and c.deleted=1 and c.courseclass=0
         <if test="course.gradeid!=null and course.gradeid!=0">
             and c.gradeid=#{course.gradeid}
         </if>
@@ -501,4 +501,9 @@
         update l_course c ,l_course_section s set c.comm=#{course.comm},s.comm=#{course.comm}
         where c.courseid=s.courseid and c.courseid=#{course.courseid}
     </update>
+
+    <!--根据课程id删除关联课程关联信息-->
+    <delete id="deleteCourseClassByCourseid">
+        delete c,tc from l_course c,t_class tc where c.classid=tc.classid and c.courseid=#{courseid}
+    </delete>
 </mapper>

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.xhkjedu.slive.mapper.xz.XzKjMapper">
 
     <!--获取行政直播课节详情-->
-    <select id="listXzKjsByXzid" resultType="java.util.Map">
+    <select id="listXzKjsByXzid" resultType="com.xhkjedu.slive.vo.xz.XzDateKjVo">
         select * from l_xz_kj where xzid=#{xzid} order by kjorder asc
     </select>
 

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

@@ -13,11 +13,10 @@
         order by x.begindate desc
     </select>
 
-    <!--行政直播课对应的课节进行中或已结束数量-->
+    <!--行政直播课对应的课程已开课数量-->
     <select id="getXzSectionKsNum" resultType="java.lang.Integer">
-        select count(*) from l_course_section s left join l_course c on c.courseid = s.courseid
-        left join l_xz_kj k on c.kjid = k.kjid
-        where k.xzid = #{xzid} and s.sectionstate BETWEEN 2 and 3
+        select count(*) from l_course c left join l_xz_kj k on c.kjid = k.kjid
+        where k.xzid = #{xzid} and c.coursestate>0
     </select>
 
     <!--删除行政直播下所有的直播课程和直播班级-->
@@ -28,14 +27,12 @@
     </delete>
     <!--删除行政直播和课节详情-->
     <delete id="deleteXzAndKjByXzid">
-        delete
-        x,k from l_xz as x left join l_xz_kj as k on x.xzid=k.xzid where x.xzid=
+        delete x,k from l_xz as x left join l_xz_kj as k on x.xzid=k.xzid where x.xzid=
         #{xzid}
     </delete>
     <!--删除行政直播下未开始的直播课、班级、课节详情-->
     <delete id="deleteCourseClassKjByXzid">
-        delete
-        c,lc,k from t_class as c left join l_course as lc on c.classid=lc.classid
+        delete c,lc,k from t_class as c left join l_course as lc on c.classid=lc.classid
         left join l_course_section ls on ls.courseid=lc.courseid
         left join l_xz_kj k on k.kjid=lc.kjid where k.xzid=#{xzid}
         and ls.sectionstate = 0
@@ -75,13 +72,13 @@
 
     <resultMap id="xzkjDate" type="java.util.Map">
         <result property="selectdate" column="selectdate"></result>
-        <collection property="kjs" ofType="com.xhkjedu.slive.vo.xz.XzDateXjVo" javaType="java.util.List">
+        <collection property="kjs" ofType="com.xhkjedu.slive.vo.xz.XzDateKjVo" javaType="java.util.List">
             <result property="kjid" column="kjid"></result>
             <result property="kjname" column="kjname"></result>
             <result property="kjorder" column="kjorder"></result>
             <result property="begintime" column="begintime"></result>
             <result property="endtime" column="endtime"></result>
-            <collection property="kjteas" ofType="com.xhkjedu.slive.vo.xz.XzDateXjTeaVo"
+            <collection property="kjteas" ofType="com.xhkjedu.slive.vo.xz.XzDateKjTeaVo"
                         javaType="java.util.List" select="listKjClassTea" column="{kjid=kjid,selectdate=selectdate}">
                 <result property="classid" column="classid"></result>
                 <result property="classname" column="classname"></result>
@@ -105,7 +102,7 @@
         group by c.begindate,k.kjid
     </select>
     <!--获取指定课节指定日期所有班级的课程和教师-->
-    <select id="listKjClassTea" resultType="com.xhkjedu.slive.vo.xz.XzDateXjTeaVo">
+    <select id="listKjClassTea" resultType="com.xhkjedu.slive.vo.xz.XzDateKjTeaVo">
         select c.classid,lc.classname,c.teacherid,u.username as teachername,
                c.subjectid,s.subjectname,c.kjid,c.courseid,c.coursestate
         from l_course c left join l_course_class cc on c.courseid=cc.courseid