소스 검색

连堂调整未开始课程

liujc 2 년 전
부모
커밋
768ff2d3c0
1개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

+ 4 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -6525,6 +6525,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 						int size = beforeCourse.size();
 						collect = beforeCourse.subList(size - 2, size).stream()
+                                .filter(o -> CourseStatusEnum.NOT_START.equals(o.getStatus()))
 								.map(CourseSchedule::getId)
 								.distinct().collect(Collectors.toList());
 						if (CollectionUtils.isNotEmpty(collect)) {
@@ -6535,7 +6536,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 					// 课程后连堂状态
 					if (afterCourse.get(0).getContinuousCourse()) {
-						collect = afterCourse.stream().map(CourseSchedule::getId).distinct().collect(Collectors.toList());
+						collect = afterCourse.stream()
+                                .filter(o -> CourseStatusEnum.NOT_START.equals(o.getStatus()))
+                                .map(CourseSchedule::getId).distinct().collect(Collectors.toList());
 
 						if (CollectionUtils.isNotEmpty(collect)) {
 							// 关联直播间编号