修改保存单个课程返回值

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

@@ -360,7 +360,8 @@ public class XzService {
 
     //保存行政直播课程表
     @Transactional(rollbackFor = Exception.class)
-    public void saveCourseAll(List<XzDateKjTeaVo> xjTeas, LCourse course) {
+    public Integer saveCourseAll(List<XzDateKjTeaVo> xjTeas, LCourse course) {
+        Integer courseid = 0;
         try {
             //获取集合中所有的班级id
             List classidlst = xjTeas.stream().map(XzDateKjTeaVo::getClassid).collect(Collectors.toList());
@@ -393,7 +394,7 @@ public class XzService {
 
             //保存课程信息
             courseMapper.insertUseGeneratedKeys(course);
-            Integer courseid = course.getId();//课程id
+            courseid = course.getId();//课程id
 
             List<Integer> studentids = new ArrayList<>();
             users.forEach(userVo -> {
@@ -430,10 +431,12 @@ public class XzService {
             cs.setCreateid(course.getCreateid());
             cs.setCreatetime(course.getCreatetime());
             courseSectionMapper.insertUseGeneratedKeys(cs);//保存课程课节信息
+
         } catch (Exception e) {
             log.info("保存行政直播课程表出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
+        return courseid;
     }
 
     /**
@@ -557,10 +560,12 @@ public class XzService {
             kjTeaVo.setGradeid(xz.getGradeid());
             kjTeaVo.setSchoolid(xz.getSchoolid());
 
+            Integer courseid = 0;//存放新添加课程id
+
             //先判断是保存当前课程还是后续日期的课
             if (N_Utils.isEmptyInteger(kjTeaVo.getKfollow())) {
                 //kfollow为0或者空，则只需要保存当前选中的课程
-                ((XzService) applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
+                courseid = ((XzService) applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
             } else {
                 //需要保存后续和当前日期相同的星期相同课节的课程，判断后续日期是否有课程，如果有则提示先删除后再添加
                 //获取已生成课程的往后日期
@@ -571,17 +576,21 @@ public class XzService {
                     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);
+
+                            Integer rtnid = ((XzService)applicationContext.getBean("xzService")).saveOneXzkjDygForDetail(kjTeaVo);
+                            if(i==0){
+                                courseid = rtnid;
+                            }
+
                         }
                     }
                 }
             }
-            return new ResultVo(0, "成功保存课程表单个课程");
+            return new ResultVo(0, "成功保存课程表单个课程",courseid);
         } catch (Exception e) {
             log.error("保存课程表单个课程出错：" + e.getMessage());
             return new ResultVo(1, "保存课程表单个课程失败");
@@ -590,7 +599,8 @@ public class XzService {
 
     //保存单个课程
     @Transactional(rollbackFor = Exception.class)
-    public void saveOneXzkjDygForDetail(XzDateKjTeaVo kjTeaVo) {
+    public Integer saveOneXzkjDygForDetail(XzDateKjTeaVo kjTeaVo) {
+        Integer courseid = 0;
         try {
             //先看新选择的教师情况，先判断选中的同一日期课节教师是否还有其他直播课
             CourseVo courseVo = courseMapper.getCourseByDateKjTeacher(kjTeaVo);
@@ -625,8 +635,9 @@ public class XzService {
                 //保存行政直播课程表,调用保存整个课表时的方法
                 List<XzDateKjTeaVo> lst = new ArrayList<>();
                 lst.add(kjTeaVo);
-                ((XzService) applicationContext.getBean("xzService")).saveCourseAll(lst, course);
+                courseid = ((XzService) applicationContext.getBean("xzService")).saveCourseAll(lst, course);
             } else {
+                courseid = courseVo.getCourseid();
                 //说明该教师当前有其他直播课，则把班级加入课程，完成直播课学生数量
                 TClassStudent cs = new TClassStudent();
                 cs.setSchoolid(kjTeaVo.getSchoolid());
@@ -643,6 +654,7 @@ public class XzService {
             log.error("保存单个课程出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
+        return courseid;
     }
 
 

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/ClassStudentController.java

@@ -105,6 +105,8 @@ public class ClassStudentController {
         Integer classid = tClassStudent.getClassid();
         N_Utils.validation(new Object[]{classid, "班级id", 1,tClassStudent.getSchoolid(),"学校id",1});
         Integer page = tClassStudent.getPage();
+        Integer year = classStudentService.getSchoolyear(tClassStudent.getSchoolid());
+        tClassStudent.setYear(year);
         if (N_Utils.isEmptyInteger(page)) {
             List<ClassStudentVo> list = classStudentService.listStudentForliveclass(tClassStudent);
             return new ResultVo(0,"获取列表成功",list);

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassStudentService.java

@@ -236,11 +236,13 @@ public class ClassStudentService {
         return classStudentMapper.findAll(student);
     }
 
+    public Integer getSchoolyear(Integer schoolid){
+        return schoolMapper.getYearById(schoolid);
+    }
+
     //直播班中班级集合
     public List<ClassStudentVo> listStudentForliveclass(TClassStudent student) {
         setOrderField(student);
-        Integer year = schoolMapper.getYearById(student.getSchoolid());
-        student.setYear(year);
         List<ClassStudentVo> rtnlst = classStudentMapper.listStudentForliveclass(student);
         for (int i=0;i<rtnlst.size();i++){
             ClassStudentVo cs = rtnlst.get(i);

suser/src/main/resources/mapper/gradeclass/ClassStudentMapper.xml

@@ -120,7 +120,7 @@
 
     <!--直播班中学生信息-->
     <select id="listStudentForliveclass" resultType="com.xhkjedu.suser.vo.gradeclass.ClassStudentVo">
-        select cs.csid,cs.classid,u.username studentname,u.studentno,u.usersex,u.userid studentid,u.loginname,cs.createtime
+        select distinct cs.csid,cs.classid,u.username studentname,u.studentno,u.usersex,u.userid studentid,u.loginname,cs.createtime
         ,u.bindmac,u.mac,u.headpic,u.userphone,u.usertime,
         (select concat(c2.gradeid,'_',c2.classname) from t_class_student cs2 left join t_class c2 on cs2.classid=c2.classid
         where cs2.studentid=cs.studentid and c2.classtype=1 and c2.classstate=1 and c2.year=#{student.year} order by c2.classid desc limit 1)classname