教师听课

删除course/kj_xkdate、section/list_xkdate

slive/src/main/java/com/xhkjedu/slive/controller/liveplay/CourseController.java

@@ -213,7 +213,7 @@ public class CourseController {
         return new ResultVo(0,"获取月份下日期课节数量成功",lst);
     }
 
-    //指定日期的课节列表
+    //学生直播端--指定日期的课节列表
     @PostMapping("/kj_list")
     public ResultVo listSectionsByDate(@RequestBody CourseParams params) {
         N_Utils.validation(new Object[]{params.getStudentid(),"学生id",1,params.getTimestr(),"日期",2});
@@ -229,16 +229,7 @@ public class CourseController {
         return new ResultVo(0,"获取月份下日期课节数量成功",lst);
     }
 
-    //巡课--指定月份课程日期数量
-    @PostMapping("/kj_xkdate")
-    public ResultVo listSectionDateForXk(@RequestBody CourseParams params) {
-        if (params.getUsertype() == null) return new ResultVo(1,"用户类型不能为空");
-        N_Utils.validation(new Object[]{params.getTimestr(),"月份",2
-                ,params.getTeacherid(),"用户id",1,params.getSchoolid(),"学校id",1});
-        List<SectionDateVo> lst = courseService.listSectionDateForXk(params);
-        return new ResultVo(0, "获取月份下日期课节数量成功", lst);
-    }
-
+    //直播巡课--指定月份课程日期数量
     @PostMapping("/kj_xkdate2")
     public ResultVo listSectionDateForXk2(@RequestBody CourseParams params) {
         if (params.getUsertype() == null) return new ResultVo(1, "用户类型不能为空");
@@ -265,6 +256,24 @@ public class CourseController {
         return new ResultVo(0, "获取月份下日期课节数量成功", lst);
     }
 
+    /**
+     * 教师听课-课节数量
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [params]
+     * @Author ywx
+     * @Date 2022/6/28 9:20
+     **/
+    @PostMapping("/kj_jstkdate")
+    public ResultVo listSectionDateForJsTk(@RequestBody CourseParams params) {
+        N_Utils.validation(new Object[]{params.getTimestr(), "月份", 2
+                , params.getTeacherid(), "用户id", 1, params.getSchoolid(), "学校id", 1
+                , params.getGradeid(), "年级id", 1, params.getSubjectid(), "科目id", 2});
+        params.setUsertype(0);
+        List<Map> list = courseService.listSectionDateForXk2(params);
+        return new ResultVo(0, "获取月份下日期课节数量成功", list);
+    }
+
     //处理直播学生 (帮忙处理数据时用的，系统未调用)
     @PostMapping("/handle_stu")
     public ResultVo handleStu(@RequestBody CourseParams params) {
@@ -273,7 +282,6 @@ public class CourseController {
         return new ResultVo(0, "处理直播学生成功");
     }
 
-
     /**
      * @Description 修改课程名称
      * @Param [c]

slive/src/main/java/com/xhkjedu/slive/controller/liveplay/CourseSectionController.java

@@ -110,6 +110,7 @@ public class CourseSectionController {
         return new ResultVo(0,"修改课节回放信息成功");
     }*/
 
+    //教师直播端--课节列表
     @PostMapping("/list_date")
     public ResultVo listByDate(@RequestBody LCourseSection section) {
         String sectiondate = section.getSectiondate();
@@ -118,18 +119,7 @@ public class CourseSectionController {
         return new ResultVo(0,"根据日期获取教师课节列表成功",list);
     }
 
-    @PostMapping("/list_xkdate")
-    public ResultVo listXkByDate(@RequestBody CourseParams params) {
-        if (params.getUsertype() == null) return new ResultVo(1,"用户类型不能为空");
-        N_Utils.validation(new Object[]{params.getTimestr(),"月份",2
-                ,params.getPage(),"显示页码",1,params.getPageSize(),"显示条数",1
-                ,params.getTeacherid(),"用户id",1,params.getSchoolid(),"学校id",1});
-        courseSectionService.setClassIds(params);//设置教师任教行政和提高班id
-        PageHelper.startPage(params.getPage(), params.getPageSize());
-        List<CourseSectionVo> list = courseSectionService.listXkByDate(params);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
-        return new ResultVo(0,"根据日期获取教师课节列表成功",pageResult);
-    }
+    //直播巡课--课节列表
     @PostMapping("/list_xkdate2")
     public ResultVo listXkByDate2(@RequestBody CourseParams params) {
         if (params.getUsertype() == null) return new ResultVo(1, "用户类型不能为空");
@@ -138,7 +128,7 @@ public class CourseSectionController {
                 , params.getTeacherid(), "用户id", 1, params.getSchoolid(), "学校id", 1});
         courseSectionService.setClassIds(params);//设置教师任教行政和提高班id
         PageHelper.startPage(params.getPage(), params.getPageSize());
-        List<CourseSectionVo> list = courseSectionService.listXkByDate2(params);
+        List<CourseSectionVo> list = courseSectionService.listXkByDate(params);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0, "根据日期获取教师课节列表成功", pageResult);
     }
@@ -158,7 +148,27 @@ public class CourseSectionController {
                 , params.getTeacherid(), "用户id", 1, params.getSchoolid(), "学校id", 1});
         params.setUsertype(0);
         PageHelper.startPage(params.getPage(), params.getPageSize());
-        List<CourseSectionVo> list = courseSectionService.listXkByDate2(params);
+        List<CourseSectionVo> list = courseSectionService.listXkByDate(params);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
+        return new ResultVo(0, "根据日期获取教师课节列表成功", pageResult);
+    }
+
+    /**
+     * 教师听课-课节列表
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [params]
+     * @Author ywx
+     * @Date 2022/6/28 9:10
+     **/
+    @PostMapping("/list_jstkdate")
+    public ResultVo listJsTkByDate(@RequestBody CourseParams params) {
+        N_Utils.validation(new Object[]{params.getTimestr(), "月份", 2
+                , params.getPage(), "显示页码", 1, params.getPageSize(), "显示条数", 1
+                , params.getTeacherid(), "用户id", 1, params.getSchoolid(), "学校id", 1
+                , params.getGradeid(), "年级id", 1, params.getSubjectid(), "科目id", 2});
+        PageHelper.startPage(params.getPage(), params.getPageSize());
+        List<CourseSectionVo> list = courseSectionService.listXkByDate(params);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0, "根据日期获取教师课节列表成功", pageResult);
     }

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

@@ -58,7 +58,6 @@ public interface CourseMapper extends TkMapper<LCourse> {
     //教师指定月份课程日期数量
     List<SectionDateVo> listSectionDateForTeacher(@Param("course") CourseParams course);
     //巡课指定月份课程日期数量
-    List<SectionDateVo> listSectionDateForXk(@Param("course") CourseParams course);
     List<Map> listSectionDateForXk2(@Param("course") CourseParams course);
 
     LCourse getCourseByIdAndDeleted(Integer courseid,Integer deleted);

slive/src/main/java/com/xhkjedu/slive/service/liveplay/CourseSectionService.java

@@ -251,12 +251,6 @@ public class CourseSectionService {
         return courseSectionMapper.listXkByDate(p);
     }
 
-    //根据日期获取巡课课节列表
-    public List<CourseSectionVo> listXkByDate2(CourseParams p) {
-        List<CourseSectionVo> sections = courseSectionMapper.listXkByDate(p);
-        return sections;
-    }
-
     //设置教师任教行政和提高班id
     public void setClassIds(CourseParams p) {
         if (p.getUsertype() == 1 && N_Utils.isEmptyInteger(p.getClassid())) {

slive/src/main/java/com/xhkjedu/slive/service/liveplay/CourseService.java

@@ -540,15 +540,6 @@ public class CourseService {
         return courseMapper.listSectionDateForTeacher(p);
     }
 
-    //巡课指定月份课程日期数量
-    public List<SectionDateVo> listSectionDateForXk(CourseParams p) {
-        if (p.getUsertype() == 1 && N_Utils.isEmptyInteger(p.getClassid())) {
-            String classIds = classTeacherMapper.getClassIds(p.getTeacherid());//获取教师任教行政和提高班id
-            p.setClassids(classIds);
-        }
-        return courseMapper.listSectionDateForXk(p);
-    }
-
     //巡课指定月份课程日期数量2
     public List<Map> listSectionDateForXk2(CourseParams p) {
         if (p.getUsertype() == 1 && N_Utils.isEmptyInteger(p.getClassid())) {

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

@@ -339,39 +339,6 @@
         group by cs.sectiondate order by cs.planbegintime asc
     </select>
     <!--巡课某月份下日期课程数量-->
-    <select id="listSectionDateForXk" resultType="com.xhkjedu.slive.vo.liveplay.SectionDateVo">
-        select cs.sectiondate as timestr,count(distinct cs.sectionid)as num
-        from l_course_section cs
-        left join l_course c on cs.courseid=c.courseid
-        <if test="(course.classid!=null and course.classid!=0)
-        or (course.classids!=null and course.classids!='')">
-            left join l_course_class cc on cc.courseid=c.courseid
-        </if>
-        <if test="course.teachername!=null and course.teachername!=''">
-            left join t_user u on cs.teacherid=u.userid
-        </if>
-        where c.deleted=1 and c.schoolid=#{course.schoolid}
-        and DATE_FORMAT(cs.sectiondate, '%Y-%m')=#{course.timestr}
-        <if test="course.teachername!=null and course.teachername!=''">
-            and u.username like '%${course.teachername}%'
-        </if>
-        <if test="course.cstate!=null and course.cstate!=-1">
-            and cs.sectionstate=#{course.cstate}
-        </if>
-        <if test="course.gradeid!=null and course.gradeid!=0">
-            and c.gradeid=#{course.gradeid}
-        </if>
-        <if test="course.subjectid!=null and course.subjectid!='0'.toString() and course.subjectid!=''">
-            and c.subjectid=#{course.subjectid}
-        </if>
-        <if test="course.classid!=null and course.classid!=0">
-            and cc.classid=#{course.classid}
-        </if>
-        <if test="course.classids!=null and course.classids!=''">
-            and cc.classid in (${course.classids})
-        </if>
-        group by cs.sectiondate order by cs.sectiondate asc
-    </select>
     <select id="listSectionDateForXk2" resultType="java.util.Map">
         select cs.sectiondate as timestr,count(distinct cs.sectionid)as num
         ,count(distinct case when cs.sectionstate=0 then cs.sectionid else null end)wksnum