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

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

@@ -116,4 +116,7 @@ public interface CourseSectionMapper extends TkMapper<LCourseSection> {
 
     //根据班级id获取课程班级类型
     Integer getCourseTypeByClassId(@Param("classid") Integer classid);
+
+    //获取课程中正在进行的课节数量
+    Integer getJxzSectionNum(@Param("courseid") Integer courseid);
 }

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

@@ -4,6 +4,7 @@ import com.xhkjedu.slive.mapper.gradeclass.ClassTeacherMapper;
 import com.xhkjedu.slive.mapper.gradeclass.SchoolMapper;
 import com.xhkjedu.slive.mapper.liveplay.CourseClassMapper;
 import com.xhkjedu.slive.mapper.liveplay.CourseMapper;
+import com.xhkjedu.slive.mapper.liveplay.CourseSectionMapper;
 import com.xhkjedu.slive.mapper.system.UserMapper;
 import com.xhkjedu.slive.model.gradeclass.TClass;
 import com.xhkjedu.slive.model.gradeclass.TClassTeacher;
@@ -50,6 +51,8 @@ public class CourseService {
     private UserMapper userMapper;
     @Resource
     private CourseClassMapper courseClassMapper;
+    @Resource
+    private CourseSectionMapper courseSectionMapper;
 
     //添加
     @Transactional(rollbackFor = Exception.class)
@@ -315,6 +318,12 @@ public class CourseService {
                 return new ResultVo(1, "没有结课权限");
             }
 
+            //结课时判断是否有进行中的直播课，如果有就提示
+            Integer jxznum = courseSectionMapper.getJxzSectionNum(course.getCourseid());
+            if(N_Utils.isTrueInteger(jxznum)){
+                return new ResultVo(1,"有进行中的课程，暂不能结课");
+            }
+
             //如果课程状态变成已结束，则班级变成结束直播班类型
             classService.updateClasstype(c.getClassid(),99);
         }

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

@@ -489,4 +489,9 @@
         </if>
         order by cs.sectionstate,abs(UNIX_TIMESTAMP(concat(cs.sectiondate,' ',cs.planbegintime))-UNIX_TIMESTAMP(now())),cs.sectionid
     </select>
+    
+    <!--获取课程中正在进行的课节数量-->
+    <select id="getJxzSectionNum" resultType="java.lang.Integer">
+        select count(*) from l_course_section where courseid=#{courseid} and sectionstate=2
+    </select>
 </mapper>