添加班级人数

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

@@ -239,8 +239,15 @@ public class XzService {
                             course.setBegintime(kjVo.getBegintime());
                             course.setEndtime(kjVo.getEndtime());
                             course.setKjid(kjVo.getKjid());
-                            //保存行政直播课程表,该方式解决事务不生效问题
-                            ((XzService)applicationContext.getBean("xzService")).saveCourseAll(xjTeas, course);
+
+                            //获取集合中所有的班级id
+                            List classidlst = xjTeas.stream().map(XzDateKjTeaVo::getClassid).collect(Collectors.toList());
+                            List<Map> users = courseMapper.listUid(classidlst);//获取课班级下学生
+                            //只有当班级下有学生时进行保存
+                            if(users!=null && users.size() > 0){
+                                //保存行政直播课程表,该方式解决事务不生效问题
+                                ((XzService)applicationContext.getBean("xzService")).saveCourseAll(xjTeas, course,users);
+                            }
                         }
                     }
                 }
@@ -365,16 +372,10 @@ public class XzService {
 
     //保存行政直播课程表
     @Transactional(rollbackFor = Exception.class)
-    public Integer saveCourseAll(List<XzDateKjTeaVo> xjTeas, LCourse course) {
+    public Integer saveCourseAll(List<XzDateKjTeaVo> xjTeas, LCourse course,List<Map> users) {
         Integer courseid = 0;
         try {
-            //获取集合中所有的班级id
             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();
@@ -464,8 +465,6 @@ public class XzService {
         List<XzDateKjVo> kjs = xzKjMapper.listXzKjsByXzid(xz.getXzid());
         map.put("kjs", kjs);//保存所有课节信息
 
-        List<XzDateVo> classdatelst = new ArrayList<>();//班级日期课节
-
         //根据行政直播id获取该学校当前年份指定年级下的行政班和提高班
         List<XzClassVo> classlst = classMapper.listClassByXzid(xz.getXzid());
         //先获取选择要看的有效日期，不能超出行政直播结束的日期
@@ -603,12 +602,16 @@ public class XzService {
             return new ResultVo(0, "保存成功",courseid);
         } catch (Exception e) {
             log.error("保存课程表单个课程出错：" + e.getMessage());
-            return new ResultVo(1, "保存失败");
+            if(e.getMessage().equals("所选班级无学生")){
+                return new ResultVo(1, "保存失败：所选班级无学生");
+            }else{
+                return new ResultVo(1, "保存失败");
+            }
         }
     }
 
     //判断单个课程是否存在如果存在只需要合并班级不存在保存单个课程
-    private Integer saveOneXzkjDygForDetail(XzDateKjTeaVo kjTeaVo) {
+    private Integer saveOneXzkjDygForDetail(XzDateKjTeaVo kjTeaVo) throws Exception{
         Integer courseid = 0;
         //先看新选择的教师情况，先判断选中的同一日期课节教师是否还有其他直播课
         CourseVo courseVo = courseMapper.getCourseByDateKjTeacher(kjTeaVo);
@@ -643,7 +646,15 @@ public class XzService {
             //保存行政直播课程表,调用保存整个课表时的方法
             List<XzDateKjTeaVo> lst = new ArrayList<>();
             lst.add(kjTeaVo);
-            courseid = ((XzService) applicationContext.getBean("xzService")).saveCourseAll(lst, course);
+
+            //获取集合中所有的班级id
+            List classidlst = lst.stream().map(XzDateKjTeaVo::getClassid).collect(Collectors.toList());
+            List<Map> users = courseMapper.listUid(classidlst);//获取课班级下学生
+            //如果所选班级无学生，则抛出异常 提示
+            if(users==null || users.size()==0){
+                throw new Exception("所选班级无学生");
+            }
+            courseid = ((XzService) applicationContext.getBean("xzService")).saveCourseAll(lst, course,users);
         } else {
             courseid = courseVo.getCourseid();
             ((XzService) applicationContext.getBean("xzService")).saveOneXzkjDygForDetailExist(kjTeaVo,courseVo);

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

@@ -15,6 +15,8 @@ public class XzClassVo {
 
     private String classname; //班级名称
 
+    private Integer classnum;//班级人数
+
     private Integer gradeid;//年级
 
     private Integer classtype;//班级类型

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

@@ -51,7 +51,7 @@
 
     <!--获取年级下所有行政班和提高班-->
     <select id="listClassByXzid" resultType="com.xhkjedu.slive.vo.xz.XzClassVo">
-        select DISTINCT c.classid,c.classname,c.classtype,c.gradeid from t_class c
+        select DISTINCT c.classid,c.classname,c.classnum,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)