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

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

@@ -137,7 +137,7 @@ public class XzController {
 
 
     /**
-     * @Description  保存行政直播课程表
+     * @Description  保存行政直播课程表(整个)
      * @Param [xz]
      * @Return com.xhkjedu.vo.ResultVo
      * @Author wn
@@ -159,22 +159,21 @@ public class XzController {
     @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, "成功删除单个课程信息");
+        return xzService.delXzkjDyg(kjTeaVo);
     }
 
     /**
-     * @Description 修改课程表单个单元格数据
+     * @Description 保存课程表单个单元格数据（单元格）
      * @Param [kjTeaVo]
      * @Return com.xhkjedu.vo.ResultVo
      * @Author wn
      * @Date 2022/4/2 17:11
      **/
-    @PostMapping("/kcbup")
-    public ResultVo updateXzkjDyg(@RequestBody XzDateKjTeaVo kjTeaVo){
-        N_Utils.validation(new Object[]{kjTeaVo.getCourseid(),"课程id",1,kjTeaVo.getClassid(),"班级id",1,kjTeaVo.getCreateid(),"操作人id",1});
-        xzService.updateXzKjDyg(kjTeaVo);
-        return new ResultVo(0, "成功修改单个课程信息");
+    @PostMapping("/kcbsone")
+    public ResultVo saveOneXzkjDyg(@RequestBody XzDateKjTeaVo kjTeaVo){
+        N_Utils.validation(new Object[]{kjTeaVo.getKjid(),"课节id",1,kjTeaVo.getClassid(),"班级id",1,kjTeaVo.getCreateid(),"操作人id",1,
+        kjTeaVo.getTeacherid(),"教师id",1,kjTeaVo.getSeldate(),"时间",2});
+        return xzService.saveOneXzKjDyg(kjTeaVo);
     }
 
 }

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

@@ -3,6 +3,7 @@ package com.xhkjedu.slive.mapper.gradeclass;
 import com.xhkjedu.slive.base.TkMapper;
 import com.xhkjedu.slive.model.gradeclass.TClass;
 import com.xhkjedu.slive.vo.gradeclass.ClassVo;
+import com.xhkjedu.slive.vo.xz.XzClassVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -31,4 +32,7 @@ public interface ClassMapper extends TkMapper<TClass> {
 
     //删除班级学生及分组学生
     void deleteClassstu(@Param("zbclassid") Integer zbclassid, @Param("classid")Integer classid);
+
+    //根据行政直播id获取该学校当前年份指定年级下的行政班和提高班
+    List<XzClassVo> listClassByXzid(@Param("xzid")Integer xzid);
 }

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

@@ -2,12 +2,14 @@ package com.xhkjedu.slive.mapper.liveplay;
 
 import com.xhkjedu.slive.base.TkMapper;
 import com.xhkjedu.slive.model.liveplay.LCourse;
+import com.xhkjedu.slive.model.xz.LXzKj;
 import com.xhkjedu.slive.vo.liveplay.CTypeVo;
 import com.xhkjedu.slive.vo.liveplay.CourseParams;
 import com.xhkjedu.slive.vo.liveplay.CourseSectionVo;
 import com.xhkjedu.slive.vo.liveplay.CourseStudentVo;
 import com.xhkjedu.slive.vo.liveplay.CourseVo;
 import com.xhkjedu.slive.vo.liveplay.SectionDateVo;
+import com.xhkjedu.slive.vo.xz.XzDateKjTeaVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -107,7 +109,7 @@ public interface CourseMapper extends TkMapper<LCourse> {
     //获取指定课节班级日期下的课程信息
     CourseVo getCourseByKjidAndClassid(@Param("kjid") Integer kjid,@Param("classid") Integer classid,@Param("seldate") String seldate);
     //获取指定指定日期教师课节下教师的直播课
-    CourseVo getCourseByDateKjTeacher(@Param("kjid") Integer kjid,@Param("teacherid") Integer teacherid,@Param("seldate") String seldate);
-    //更改课程相关任课教师
-    void updateCourseSectionClassTeacher(@Param("courseid") Integer courseid,@Param("teacherid") Integer teacherid,@Param("subjectid") String subjectid);
+    CourseVo getCourseByDateKjTeacher(@Param("kjTeaVo") XzDateKjTeaVo kjTeaVo);
+    //修改未开课课程课节时间-
+    void updateCourseSectionTime(@Param("kj") LXzKj kj);
 }

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

@@ -20,6 +20,9 @@ public interface XzKjMapper extends TkMapper<LXzKj> {
     //获取行政直播课节详情
     List<XzDateKjVo> listXzKjsByXzid(@Param("xzid") Integer xzid);
 
+    //修改行政直播课节详情
+    void updateXzkj(@Param("kj") LXzKj kj);
+
     //批量修改行政直播课节详情
     void updateBatchXzKj(@Param("list") List<LXzKj> list);
 }

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

@@ -2,8 +2,6 @@ package com.xhkjedu.slive.mapper.xz;
 
 import com.xhkjedu.slive.base.TkMapper;
 import com.xhkjedu.slive.model.xz.LXz;
-import com.xhkjedu.slive.vo.xz.XzDateKjVo;
-import com.xhkjedu.slive.vo.xz.XzDateVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -43,8 +41,11 @@ public interface XzMapper extends TkMapper<LXz> {
     List<Map> listXzKjsAfterSaveXz(@Param("xzid") Integer xzid);
 
     //取指定课节指定日期所有班级的课程和教师
-    List<XzDateKjVo> listXzDateKjDetail(@Param("selectdate") String selectdate,@Param("xzid") Integer xzid);
+    List<Map> listXzDateKjDetail(@Param("selectdate") String selectdate,@Param("xzid") Integer xzid,@Param("classid")Integer classid);
 
     //获取指定课节班级对应的课程的日期
     List<String> getAllDatesForKj(@Param("kjid") Integer kjid,@Param("classid") Integer classid,@Param("seldate") String seldate);
+
+    //根据课节id获取行政直播详情
+    LXz getXzByXzkjid(@Param("kjid") Integer kjid);
 }

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

@@ -110,6 +110,7 @@ public class CourseService {
             //课程信息
             model.setClassid(classid);
             model.setDeleted(1);
+            model.setCourseclass(0);
             courseMapper.insertUseGeneratedKeys(model);
             List<ClassVo> classes = new ArrayList<>();
             if (model.getCoursetype() == 1) {

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

@@ -1,11 +1,15 @@
 package com.xhkjedu.slive.service.xz;
 
+import com.xhkjedu.slive.mapper.liveplay.CourseMapper;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -16,9 +20,12 @@ import java.util.List;
  * Date 2022/3/30 15:26
  **/
 @Service
+@Slf4j
 public class XzKjService {
     @Resource
     private XzKjMapper xzKjMapper;
+    @Resource
+    private CourseMapper courseMapper;
 
     /**
      * @Description  获取行政直播课节基本信息
@@ -37,23 +44,34 @@ public class XzKjService {
      * @Author wn
      * @Date 2022/3/30 21:51
      **/
+    @Transactional(rollbackFor = Exception.class)
     public ResultVo updateBatch(List<LXzKj> xzKjs) {
-        for (int i = 0; i < xzKjs.size(); i++) {
-            boolean rtn = false;
-            LXzKj kj = xzKjs.get(i);
-            if (kj.getKjid() == null || kj.getKjid() == 0) {
-                rtn = true;
-            }
-            if (N_Utils.isEmpty(kj.getKjname()) || N_Utils.isEmpty(kj.getBegintime()) || N_Utils.isEmpty(kj.getEndtime())) {
-                rtn = true;
-            }
-            if(rtn){
-                return new ResultVo(1,"课节信息不完善");
+        try {
+            for (int i = 0; i < xzKjs.size(); i++) {
+                boolean rtn = false;
+                LXzKj kj = xzKjs.get(i);
+                if (kj.getKjid() == null || kj.getKjid() == 0) {
+                    rtn = true;
+                }
+                if (N_Utils.isEmpty(kj.getKjname()) || N_Utils.isEmpty(kj.getBegintime()) || N_Utils.isEmpty(kj.getEndtime())) {
+                    rtn = true;
+                }
+                if(rtn){
+                    return new ResultVo(1,"课节信息不完善");
+                }
+                //修改课节信息
+                xzKjMapper.updateXzkj(kj);
+                //修改所有未开始课程关联课节的时间
+                courseMapper.updateCourseSectionTime(kj);
             }
+            return new ResultVo(0,"修改课节信息成功");
+        }catch (Exception e){
+            log.error("修改课节信息出错："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return new ResultVo(1,"修改课节信息失败");
+
         }
 
-        xzKjMapper.updateBatchXzKj(xzKjs);
-        return new ResultVo(0,"修改课节信息成功");
     }
 
 }

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

@@ -18,6 +18,7 @@ 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.liveplay.CourseVo;
+import com.xhkjedu.slive.vo.xz.XzClassVo;
 import com.xhkjedu.slive.vo.xz.XzDateVo;
 import com.xhkjedu.slive.vo.xz.XzDateKjTeaVo;
 import com.xhkjedu.slive.vo.xz.XzDateKjVo;
@@ -32,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
+import javax.annotation.security.DenyAll;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -68,6 +70,10 @@ public class XzService {
     private ClassStudentMapper classStudentMapper;
     @Resource
     private GroupMapper groupMapper;
+
+    @Autowired
+    ApplicationContext applicationContext;
+
     /**
      * @Description 行政直播列表
      * @Param [schoolid]
@@ -109,9 +115,9 @@ public class XzService {
             }
             //批量保存行政直播对应的课节
             xzKjMapper.insertList(kjlst);
-            return new ResultVo(0, "保存行政直播成功",xzid);
-        }catch (Exception e){
-            log.error("保存行政直播出错："+e.getMessage());
+            return new ResultVo(0, "保存行政直播成功", xzid);
+        } catch (Exception e) {
+            log.error("保存行政直播出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return new ResultVo(1, "保存行政直播成功失败");
         }
@@ -231,12 +237,12 @@ public class XzService {
                         course.setEndtime(dateKjVo.getEndtime());
                         course.setKjid(dateKjVo.getKjid());
                         //保存行政直播课程表,该方式解决事务不生效问题
-                        ((XzService) AopContext.currentProxy()).saveCourseAll(xjTeas, course);
+                        ((XzService)applicationContext.getBean("xzService")).saveCourseAll(xjTeas, course);
                     }
                 }
             }
-        }catch (Exception e){
-            log.error("保存行政直播课程表出错："+e.getMessage());
+        } catch (Exception e) {
+            log.error("保存行政直播课程表出错：" + e.getMessage());
         }
 
         return new ResultVo(0, "保存行政直播课程表成功");
@@ -316,9 +322,6 @@ public class XzService {
                 cc.setCreateid(course.getCreateid());
                 cc.setCreatetime(course.getCreatetime());
                 cclist.add(cc);
-                //通知班级
-                ClassVo classVo = new ClassVo();
-                classVo.setClassid(cid);
             }
             courseClassMapper.insertList(cclist);//保存原班级和直播的关联关系
 
@@ -336,7 +339,6 @@ public class XzService {
             cs.setCreateid(course.getCreateid());
             cs.setCreatetime(course.getCreatetime());
             courseSectionMapper.insertUseGeneratedKeys(cs);//保存课程课节信息
-
         } catch (Exception e) {
             log.info("保存行政直播课程表出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -357,19 +359,29 @@ public class XzService {
 
         Map map = new HashMap();
         List<XzDateKjVo> kjs = xzKjMapper.listXzKjsByXzid(xz.getXzid());
-        map.put("kjs",kjs);//保存所有课节信息
+        map.put("kjs", kjs);//保存所有课节信息
+
+        List<XzDateVo> classdatelst = new ArrayList<>();//班级日期课节
 
-        List<XzDateVo> datelst = new ArrayList<>();//保存指定日期
+        //根据行政直播id获取该学校当前年份指定年级下的行政班和提高班
+        List<XzClassVo> classlst = classMapper.listClassByXzid(xz.getXzid());
         //先获取选择要看的有效日期，不能超出行政直播结束的日期
-        List<String> seldates = LiveUtil.listDateAfterDates(xz.getBegindate(),xz.getEnddate(),7);
-        for(int i=0;i<seldates.size();i++){
-            List<XzDateKjVo> kjlst = xzMapper.listXzDateKjDetail(seldates.get(i),xz.getXzid());//获取课节详情
-            XzDateVo dateVo = new XzDateVo();
-            dateVo.setSelectdate(seldates.get(i));
-            dateVo.setKjs(kjlst);
-            datelst.add(dateVo);
+        List<String> seldates = LiveUtil.listDateAfterDates(xz.getBegindate(), xz.getEnddate(), 7);
+
+        for (int i = 0; i < classlst.size(); i++) {
+            XzClassVo classVo = classlst.get(i);
+            List<XzDateVo> datelst = new ArrayList<>();//保存指定日期
+            for (int j = 0; j < seldates.size(); j++) {
+                List<Map> kjlst = xzMapper.listXzDateKjDetail(seldates.get(j), xz.getXzid(),classVo.getClassid());//获取课节详情
+                XzDateVo dateVo = new XzDateVo();
+                dateVo.setSelectdate(seldates.get(j));
+                dateVo.setKjsmap(kjlst);
+                datelst.add(dateVo);
+            }
+            classVo.setDates(datelst);
         }
-        map.put("xzdates", datelst);
+
+        map.put("xzdates", classlst);
         return map;
     }
 
@@ -385,44 +397,45 @@ public class XzService {
             //判断课程的状态，如果已经开始上课则不能删除
             LCourse course = courseMapper.selectByPrimaryKey(kjTeaVo.getCourseid());
             Integer kjid = course.getKjid();
-            Integer classid= kjTeaVo.getClassid();//行政班id
-            if(course.getCoursestate() > 0){
-                throw new Exception("选择的课程已经开始上课，不允许删除");
-            }else{
+            Integer classid = kjTeaVo.getClassid();//行政班id
+            if (course.getCoursestate() > 0) {
+                return new ResultVo(1,"选择的课程已经开始上课，不允许删除");
+            } else {
                 //先判断是删除当前课程还是后续日期的课
-                if(N_Utils.isEmptyInteger(kjTeaVo.getKfollow())){
+                if (N_Utils.isEmptyInteger(kjTeaVo.getKfollow())) {
                     //kfollow为0或者空，则只需要删除当前选中的课程
-                    ((XzService) AopContext.currentProxy()).delXzkjDygForDetail(kjTeaVo,course.getClassid());
-                }else{
+                    ((XzService)applicationContext.getBean("xzService")).delXzkjDygForDetail(kjTeaVo, course.getClassid());
+                } else {
                     //需要删除后续和当前日期相同的星期相同课节的课程
-                    //获取已生成课程的最后日期
-                    List<String> alldates = xzMapper.getAllDatesForKj(kjid,classid,course.getBegindate());
-                    if(alldates!=null && alldates.size()>0){
+                    //获取已生成课程从所选删除课程开始日期到结束日期内所有日期
+                    List<String> alldates = xzMapper.getAllDatesForKj(kjid, classid, course.getBegindate());
+                    if (alldates != null && alldates.size() > 0) {
                         //已经成课程中符合周的需要删除的日期
-                        List<String> deldates = LiveUtil.getMeetDayOfDates(alldates,course.getBegindate());
-                        if(deldates!=null && deldates.size()>0){
-                            for(int i=0;i<deldates.size();i++){
+                        List<String> deldates = LiveUtil.getMeetDayOfDates(alldates, course.getBegindate());
+                        if (deldates != null && deldates.size() > 0) {
+                            for (int i = 0; i < deldates.size(); i++) {
                                 //先获取指定日期对应的课程
-                                CourseVo courseVo = courseMapper.getCourseByKjidAndClassid(kjid,classid,deldates.get(i));
-                                ((XzService) AopContext.currentProxy()).delXzkjDygForDetail(kjTeaVo,courseVo.getClassid());
+                                CourseVo courseVo = courseMapper.getCourseByKjidAndClassid(kjid, classid, deldates.get(i));
+                                kjTeaVo.setCourseid(courseVo.getCourseid());
+                                ((XzService)applicationContext.getBean("xzService")).delXzkjDygForDetail(kjTeaVo,courseVo.getClassid());
                             }
                         }
                     }
                 }
-                return new ResultVo(0,"成功删除课程表单个课程");
+                return new ResultVo(0, "成功删除课程表单个课程");
             }
-        }catch (Exception e){
-            log.error("删除课程表单个课程出错："+e.getMessage());
-            return new ResultVo(1,"删除课程表单个课程失败");
+        } catch (Exception e) {
+            log.error("删除课程表单个课程出错：" + e.getMessage());
+            return new ResultVo(1, "删除课程表单个课程失败");
         }
     }
 
     //删除单个课程表
     @Transactional(rollbackFor = Exception.class)
-    public void delXzkjDygForDetail(XzDateKjTeaVo kjTeaVo,Integer zbclassid) {
+    public void delXzkjDygForDetail(XzDateKjTeaVo kjTeaVo, Integer zbclassid) {
         try {
             //删除单个单元格中设置的教师信息，先判断该单元格对应的课程是否有其他班级
-            Integer coursenum = courseClassMapper.getOtherClassnumByCourseid(kjTeaVo.getCourseid(), kjTeaVo.getClassid());
+            Integer coursenum = courseClassMapper.getOtherClassnumByCourseid(kjTeaVo.getCourseid(),kjTeaVo.getClassid());
             if (coursenum == 0) {
                 //说明该课程仅关联一个班级,直接删除该课程以及该课程对应的直播班
                 courseMapper.deleteCourseClassByCourseid(kjTeaVo.getCourseid());
@@ -434,95 +447,109 @@ public class XzService {
                 classMapper.updateNum2(zbclassid);//更改班级以及班级分组人数
                 courseMapper.updateStuNum(kjTeaVo.getCourseid());//更新直播课学生数量
             }
-        }catch (Exception e){
-           log.error("删除单个课程出错："+e.getMessage());
-           TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        } catch (Exception e) {
+            log.error("删除单个课程出错：" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
     }
 
     /**
-     * @Description 修改单个单元格
+     * @Description 保存单个单元格（单元格）
      * @Param [kjTeaVo]
      * @Return com.xhkjedu.vo.ResultVo
      * @Author wn
      * @Date 2022/4/2 15:19
      **/
-    public ResultVo updateXzKjDyg(XzDateKjTeaVo kjTeaVo){
+    public ResultVo saveOneXzKjDyg(XzDateKjTeaVo kjTeaVo) {
         try {
-            //判断课程的状态，如果已经开始上课则不能修改
-            LCourse course = courseMapper.selectByPrimaryKey(kjTeaVo.getCourseid());
-            Integer kjid = course.getKjid();
-            Integer classid= kjTeaVo.getClassid();//行政班id
-            if(course.getCoursestate() > 0){
-                throw new Exception("选择的课程已经开始上课，不允许修改");
-            }else{
-                //先判断是修改当前课程还是后续日期的课
-                if(N_Utils.isEmptyInteger(kjTeaVo.getKfollow())){
-                    //kfollow为0或者空，则只需要修改当前选中的课程
-                    ((XzService) AopContext.currentProxy()).updateXzkjDygForDetail(kjTeaVo,course);
-                }else{
-                    //需要修改后续和当前日期相同的星期相同课节的课程
-                    //获取已生成课程的最后日期
-                    List<String> alldates = xzMapper.getAllDatesForKj(kjid,classid,course.getBegindate());
-                    if(alldates!=null && alldates.size()>0){
-                        //已经成课程中符合周的需要修改的日期
-                        List<String> deldates = LiveUtil.getMeetDayOfDates(alldates,course.getBegindate());
-                        if(deldates!=null && deldates.size()>0){
-                            for(int i=0;i<deldates.size();i++){
-                                //先获取指定日期对应的课程
-                                course.setBegintime(deldates.get(i));
-                                ((XzService) AopContext.currentProxy()).updateXzkjDygForDetail(kjTeaVo,course);
-                            }
+            LXz xz = xzMapper.getXzByXzkjid(kjTeaVo.getKjid());
+            kjTeaVo.setGradeid(xz.getGradeid());
+            kjTeaVo.setSchoolid(xz.getSchoolid());
+
+            //先判断是保存当前课程还是后续日期的课
+            if (N_Utils.isEmptyInteger(kjTeaVo.getKfollow())) {
+                //kfollow为0或者空，则只需要保存当前选中的课程
+                ((XzService)applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
+            } else {
+                //需要保存后续和当前日期相同的星期相同课节的课程，判断后续日期是否有课程，如果有则提示先删除后再添加
+                //获取已生成课程的往后日期
+                List<String> alldates = xzMapper.getAllDatesForKj(kjTeaVo.getKjid(), kjTeaVo.getClassid(), kjTeaVo.getSeldate());
+                if(alldates != null && alldates.size() > 0){
+                    //去匹配是否包含在当前选中日期后续周对应的日期
+                    List<String> afterlst = LiveUtil.getMeetDayOfDates(alldates,kjTeaVo.getSeldate());
+                    if(afterlst != null && afterlst.size() > 0){
+                        return new ResultVo(1,"同日期同班级同课节有数据，不能保存");
+                    }else{
+
+                        //获取seldate至结束日期时端内符合条件的日期
+                        List<String> savedates = LiveUtil.getDaysForMeetDates(kjTeaVo.getSeldate(),xz.getEnddate());
+                        for (int i = 0; i < savedates.size(); i++) {
+                            kjTeaVo.setSeldate(savedates.get(i));
+//                            ((XzService)applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
                         }
                     }
                 }
-                return new ResultVo(0,"成功修改课程表单个课程");
             }
-        }catch (Exception e){
-            log.error("修改课程表单个课程出错："+e.getMessage());
-            return new ResultVo(1,"修改课程表单个课程失败");
+            return new ResultVo(0, "成功保存课程表单个课程");
+        } catch (Exception e) {
+            log.error("保存课程表单个课程出错：" + e.getMessage());
+            return new ResultVo(1, "保存课程表单个课程失败");
         }
     }
 
-    //修改单个课程
+    //保存单个课程
     @Transactional(rollbackFor = Exception.class)
-    public void updateXzkjDygForDetail(XzDateKjTeaVo kjTeaVo,LCourse course) {
+    public void saveOneXzkjDygForDetail(XzDateKjTeaVo kjTeaVo) {
         try {
             //先看新选择的教师情况，先判断选中的同一日期课节教师是否还有其他直播课
-            CourseVo courseVo = courseMapper.getCourseByDateKjTeacher(course.getKjid(),kjTeaVo.getTeacherid(),course.getBegindate());
-            if(courseVo==null){
-                //说明该老师之前没有直播课，则直接修改课程任课教师，直播班关联教师以及科目
-                courseMapper.updateCourseSectionClassTeacher(course.getCourseid(),kjTeaVo.getTeacherid(),kjTeaVo.getSubjectid());
-            }else{
+            CourseVo courseVo = courseMapper.getCourseByDateKjTeacher(kjTeaVo);
+            if (courseVo == null) {
+                //说明该老师之前没有直播课，则直接保存为新的课程
+                LCourse course = new LCourse();
+                course.setGradeid(kjTeaVo.getGradeid());
+                course.setBegindate(kjTeaVo.getSeldate());
+                course.setEnddate(kjTeaVo.getSeldate());
+                course.setCoursenum(1);
+                course.setCoursetype(1);
+                course.setCourseclass(1);
+                course.setCoursestate(0);
+                course.setDeleted(1);
+                course.setCourseselected(0);
+                course.setCreateid(kjTeaVo.getCreateid());
+                course.setCreatetime(N_Utils.getSecondTimestamp());
+                course.setSchoolid(kjTeaVo.getSchoolid());
+
+                String datezhou = LiveUtil.getDateZhou(kjTeaVo.getSeldate());
+                LXzKj kj = xzKjMapper.selectByPrimaryKey(kjTeaVo.getKjid());//课节详情
+
+                //单个教师课程信息
+                String coursename = datezhou + kj.getKjname() + kjTeaVo.getSubjectname() + "(" + kjTeaVo.getTeachername() + ")";
+
+                course.setCoursename(coursename);
+                course.setSubjectid(kjTeaVo.getSubjectid());
+                course.setTeacherid(kjTeaVo.getTeacherid());
+                course.setBegintime(kj.getBegintime());
+                course.setEndtime(kj.getEndtime());
+                course.setKjid(kjTeaVo.getKjid());
+                //保存行政直播课程表,调用保存整个课表时的方法
+                List<XzDateKjTeaVo> lst = new ArrayList<>();
+                lst.add(kjTeaVo);
+                ((XzService)applicationContext.getBean("xzService")).saveCourseAll(lst, course);
+            } else {
                 //说明该教师当前有其他直播课，则把班级加入课程，完成直播课学生数量
                 TClassStudent cs = new TClassStudent();
-                cs.setSchoolid(course.getSchoolid());
+                cs.setSchoolid(kjTeaVo.getSchoolid());
                 cs.setClassid(kjTeaVo.getClassid());
                 cs.setCreateid(kjTeaVo.getCreateid());
-                classStudentMapper.saveAllClassStu(cs,courseVo.getClassid());
+                classStudentMapper.saveAllClassStu(cs, courseVo.getClassid());
                 //获取直播班对应全班学生分组id
                 Integer groupid = groupMapper.getGroupIdByClassid(courseVo.getClassid());
-                groupMapper.saveAllClassGroupStu(cs,courseVo.getClassid(),groupid);
+                groupMapper.saveAllClassGroupStu(cs, courseVo.getClassid(), groupid);
                 classMapper.updateNum2(courseVo.getClassid());//更改直播班级以及班级分组人数
                 courseMapper.updateStuNum(courseVo.getCourseid());//更新直播课学生数量
-
-                //把指定的班级从原直播班中移除
-                //修改原单元格中设置的教师信息，先判断该单元格对应的课程是否有其他班级
-                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());//更新直播课学生数量
-                }
             }
-        }catch (Exception e){
-            log.error("修改单个课程出错："+e.getMessage());
+        } catch (Exception e) {
+            log.error("保存单个课程出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
     }

slive/src/main/java/com/xhkjedu/slive/utils/LiveUtil.java

@@ -75,7 +75,7 @@ public class LiveUtil {
         DateTimeFormatter fomatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate datas = LocalDate.parse(beginstr, fomatter);
         LocalDate enddate = LocalDate.parse(endstr,fomatter);
-
+        //days是的往后一周
         int i=0;
         while (i<days){
             int td = i ;
@@ -102,6 +102,7 @@ public class LiveUtil {
         LocalDate startDate = LocalDate.parse(startDateStr, fomatter);
         LocalDate endDate = LocalDate.parse(endDateStr, fomatter);
 
+        //指定的周几
         DayOfWeek dayOfWeek = DayOfWeek.of(weekDate);
         long distance = ChronoUnit.DAYS.between(startDate, endDate);
 
@@ -136,4 +137,27 @@ public class LiveUtil {
         return rtn;
     }
 
+    /**
+     * @Description 指定时间段内符合开始时间的周几的所有日期集合
+     * @Param [startDateStr, endDateStr]
+     * @Return java.util.List<java.lang.String>
+     * @Author wn
+     * @Date 2022/4/6 16:16
+     **/
+    public static List<String> getDaysForMeetDates(String startDateStr, String endDateStr) {
+        DateTimeFormatter fomatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate startDate = LocalDate.parse(startDateStr, fomatter);
+        LocalDate endDate = LocalDate.parse(endDateStr, fomatter);
+
+        DayOfWeek dayOfWeek = startDate.getDayOfWeek();
+        long distance = ChronoUnit.DAYS.between(startDate, endDate);
+
+        List<String> rtnlst = new ArrayList<>();
+        Stream.iterate(startDate, d -> d.plusDays(1))
+              .limit(distance + 1)
+              .filter(localDate -> dayOfWeek.toString().equals(localDate.getDayOfWeek().toString()))
+              .forEach(f -> rtnlst.add(f.toString()));
+        return rtnlst;
+    }
+
 }

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

@@ -0,0 +1,23 @@
+package com.xhkjedu.slive.vo.xz;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description 班级信息
+ * @Author WN
+ * Date 2022/4/6 10:53
+ **/
+@Data
+public class XzClassVo {
+    private Integer classid;//班级id
+
+    private String classname; //班级名称
+
+    private Integer gradeid;//年级
+
+    private Integer classtype;//班级类型
+
+    private List<XzDateVo> dates;//行政课日期
+}

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

@@ -21,8 +21,13 @@ public class XzDateKjTeaVo {
     private String subjectid;//科目id
     private String subjectname;//科目名称
 
+    private Integer kjid;//行政直播课节id
+    private String seldate;//选择设置的日期
+
     private Integer kfollow;//区分是否处理指定日期后的课0不处理1处理
+    private Integer gradeid;//年级id
     private Integer createid;//操作人id
+    private Integer schoolid;//学校id
 
     private List<XzDateKjTeaVo> xjclass;//存放层级用于保存时使用
 }

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

@@ -2,7 +2,9 @@ package com.xhkjedu.slive.vo.xz;
 
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 行政直播日期
@@ -14,5 +16,7 @@ public class XzDateVo {
     private String selectdate;//当前选择日期
     private List<XzDateKjVo> kjs;//行政直播课节集合
 
+    private List<Map> kjsmap = new ArrayList<>();
+
 
 }

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

@@ -48,4 +48,12 @@
         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>
+
+    <!--获取年级下所有行政班和提高班-->
+    <select id="listClassByXzid" resultType="com.xhkjedu.slive.vo.xz.XzClassVo">
+        select DISTINCT c.classid,c.classname,c.classtype,c.gradeid from t_class c
+        left join t_school s on c.schoolid=s.schoolid and c.year=s.year
+        left join l_xz x on s.schoolid=x.schoolid and c.gradeid=x.gradeid
+        where x.xzid=#{xzid} and c.classstate=1 and c.classtype in (1,2)
+    </select>
 </mapper>

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

@@ -517,12 +517,13 @@
     <!--获取指定指定日期教师课节下教师的直播课-->
     <select id="getCourseByDateKjTeacher" resultType="com.xhkjedu.slive.vo.liveplay.CourseVo">
         select courseid,subjectid,classid,teacherid,kjid from l_course
-        where kjid=#{xkjid} and teacherid=#{teacherid} and begindate=#{seldate}
+        where kjid=#{kjTeaVo.kjid} and teacherid=#{kjTeaVo.teacherid} and begindate=#{kjTeaVo.seldate}
     </select>
-    <!--更改课程相关任课教师-->
-    <update id="updateCourseSectionClassTeacher">
-        update l_course c ,l_course_section s,t_class_teacher ct
-        set c.teacherid=#{teacherid},s.teacherid=#{teacherid},ct.teacherid=#{teacherid},c.subjectid=#{subjectid}
-        where c.courseid=s.courseid and ct.classid=c.classid and c.courseid=#{courseid}
+
+    <!--修改未开课课程课节时间-->
+    <update id="updateCourseSectionTime">
+        update l_course c,l_course_section s set c.begintime=#{kj.begintime},c.endtime=#{kj.endtime},
+        s.planbegintime=#{kj.begintime},s.planendtime=#{kj.endtime} where c.courseid=s.courseid
+        and c.kjid=#{kj.kjid} and c.coursestate=0 and s.sectionstate=0
     </update>
 </mapper>

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

@@ -7,6 +7,12 @@
         select * from l_xz_kj where xzid=#{xzid} order by kjorder asc
     </select>
 
+    <!--修改课节信息-->
+    <update id="updateXzkj">
+        update l_xz_kj set kjname=#{kj.kjname},begintime=#{kj.begintime},endtime=#{kj.endtime}
+        where kjid=#{kj.kjid}
+    </update>
+
     <!--批量修改行政直播课节详情-->
     <update id="updateBatchXzKj" parameterType="java.util.List">
         <foreach collection="list" item="kj" index="index" separator=";">

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

@@ -70,40 +70,27 @@
         left join l_xz_kj k on x.xzid=k.xzid where x.xzid=#{xzid} order by k.kjorder
     </select>
 
-    <resultMap id="xzkjsForDate" type="com.xhkjedu.slive.vo.xz.XzDateKjVo">
-        <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.XzDateKjTeaVo"
-                    javaType="java.util.List">
-            <result property="classid" column="classid"></result>
-            <result property="classname" column="classname"></result>
-            <result property="teacherid" column="teacherid"></result>
-            <result property="teachername" column="teachername"></result>
-            <result property="courseid" column="courseid"></result>
-            <result property="subjectid" column="subjectid"></result>
-            <result property="subjectname" column="subjectname"></result>
-        </collection>
-    </resultMap>
-
     <!--获取指定课节指定日期所有班级的课程和教师-->
-    <select id="listXzDateKjDetail" resultMap="xzkjsForDate">
-        select k.kjid,k.kjname,k.kjorder,k.begintime,k.endtime,
+    <select id="listXzDateKjDetail" resultType="java.util.Map">
+        select k.kjid,k.kjname,
         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
         left join t_class lc on cc.classid=lc.classid
         left join t_user u on c.teacherid=u.userid
         left join t_subject s on c.subjectid=s.subjectid left join l_xz_kj k on c.kjid=k.kjid
-        where c.begindate=#{selectdate} and c.courseclass=1 and k.xzid=#{xzid}
+        where c.begindate=#{selectdate} and c.courseclass=1 and k.xzid=#{xzid} and cc.classid=#{classid}
         order by k.kjorder, lc.classtype, lc.classorder
     </select>
 
     <!--获取指定课节班级对应的课程的日期-->
     <select id="getAllDatesForKj" resultType="java.lang.String">
         select c.enddate from l_course c left join l_course_class cc on c.courseid=cc.courseid
-        WHERE c.kjid=#{kjid} and cc.classid=#{classid} and c.begindate<![CDATA[ <= ]]>#{seldate}
+        WHERE c.kjid=#{kjid} and cc.classid=#{classid} and c.begindate<![CDATA[ >= ]]>#{seldate}
+    </select>
+
+    <!--根据课节id获取行政直播详情-->
+    <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>
 </mapper>