优化保存单个单元格

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

@@ -372,6 +372,10 @@ public class XzService {
             List classidlst = xjTeas.stream().map(XzDateKjTeaVo::getClassid).collect(Collectors.toList());
             List<Map> users = courseMapper.listUid(classidlst);//获取课班级下学生
 
+            if(users==null || users.size()==0){
+                throw new Exception("所选班级无学生");
+            }
+
             //新生成直播班班级信息
             TClass c = new TClass();
             c.setClassname(course.getCoursename() + "班");
@@ -570,7 +574,7 @@ public class XzService {
             //先判断是保存当前课程还是后续日期的课
             if (N_Utils.isEmptyInteger(kjTeaVo.getKfollow())) {
                 //kfollow为0或者空，则只需要保存当前选中的课程
-                courseid = ((XzService) applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
+                courseid = saveOneXzkjDygForDetail(kjTeaVo);
             } else {
                 //需要保存后续和当前日期相同的星期相同课节的课程，判断后续日期是否有课程，如果有则提示先删除后再添加
                 //获取已生成课程的往后日期
@@ -589,7 +593,7 @@ public class XzService {
                 for (int i = 0; i < savedates.size(); i++) {
                     kjTeaVo.setSeldate(savedates.get(i));
 
-                    Integer rtnid = ((XzService)applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
+                    Integer rtnid = saveOneXzkjDygForDetail(kjTeaVo);
                     if(i==0){
                         courseid = rtnid;
                     }
@@ -603,73 +607,80 @@ public class XzService {
         }
     }
 
-    //保存单个课程
-    @Transactional(rollbackFor = Exception.class)
-    public Integer saveOneXzkjDygForDetail(XzDateKjTeaVo kjTeaVo) {
+    //判断单个课程是否存在如果存在只需要合并班级不存在保存单个课程
+    private Integer saveOneXzkjDygForDetail(XzDateKjTeaVo kjTeaVo) {
         Integer courseid = 0;
+        //先看新选择的教师情况，先判断选中的同一日期课节教师是否还有其他直播课
+        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);
+            courseid = ((XzService) applicationContext.getBean("xzService")).saveCourseAll(lst, course);
+        } else {
+            courseid = courseVo.getCourseid();
+            ((XzService) applicationContext.getBean("xzService")).saveOneXzkjDygForDetailExist(kjTeaVo,courseVo);
+        }
+        return courseid;
+    }
+
+    //保存单个表格时同日期同课节教师合并成一个直播课
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOneXzkjDygForDetailExist(XzDateKjTeaVo kjTeaVo, CourseVo courseVo){
         try {
-            //先看新选择的教师情况，先判断选中的同一日期课节教师是否还有其他直播课
-            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);
-                courseid = ((XzService) applicationContext.getBean("xzService")).saveCourseAll(lst, course);
-            } else {
-                courseid = courseVo.getCourseid();
-                //保存直播关联班级
-                LCourseClass courseClass = new LCourseClass();
-                courseClass.setCourseid(courseid);
-                courseClass.setClassid(kjTeaVo.getClassid());
-                courseClass.setCreateid(kjTeaVo.getTeacherid());
-                courseClass.setCreatetime(N_Utils.getSecondTimestamp());
-                courseClassMapper.insertUseGeneratedKeys(courseClass);
-
-                //说明该教师当前有其他直播课，则把班级加入课程，完成直播课学生数量
-                TClassStudent cs = new TClassStudent();
-                cs.setSchoolid(kjTeaVo.getSchoolid());
-                cs.setClassid(kjTeaVo.getClassid());
-                cs.setCreateid(kjTeaVo.getCreateid());
-                classStudentMapper.saveAllClassStu(cs, courseVo.getClassid());
-                //获取直播班对应全班学生分组id
-                Integer groupid = groupMapper.getGroupIdByClassid(courseVo.getClassid());
-                groupMapper.saveAllClassGroupStu(cs, courseVo.getClassid(), groupid);
-                classMapper.updateNum2(courseVo.getClassid());//更改直播班级以及班级分组人数
-                courseMapper.updateStuNum(courseVo.getCourseid());//更新直播课学生数量
-            }
-        } catch (Exception e) {
-            log.error("保存单个课程出错：" + e.getMessage());
+
+            //保存直播关联班级
+            LCourseClass courseClass = new LCourseClass();
+            courseClass.setCourseid(courseVo.getCourseid());
+            courseClass.setClassid(kjTeaVo.getClassid());
+            courseClass.setCreateid(kjTeaVo.getTeacherid());
+            courseClass.setCreatetime(N_Utils.getSecondTimestamp());
+            courseClassMapper.insertUseGeneratedKeys(courseClass);
+
+            //说明该教师当前有其他直播课，则把班级加入课程，完成直播课学生数量
+            TClassStudent cs = new TClassStudent();
+            cs.setSchoolid(kjTeaVo.getSchoolid());
+            cs.setClassid(kjTeaVo.getClassid());
+            cs.setCreateid(kjTeaVo.getCreateid());
+            classStudentMapper.saveAllClassStu(cs, courseVo.getClassid());
+            //获取直播班对应全班学生分组id
+            Integer groupid = groupMapper.getGroupIdByClassid(courseVo.getClassid());
+            groupMapper.saveAllClassGroupStu(cs, courseVo.getClassid(), groupid);
+            classMapper.updateNum2(courseVo.getClassid());//更改直播班级以及班级分组人数
+            courseMapper.updateStuNum(courseVo.getCourseid());//更新直播课学生数量
+        }catch (Exception e){
+            log.error("保存单个课程(课程已存在合并班级)出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
-        return courseid;
     }
 
 
+
 }