Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -667,26 +667,21 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     public IPage<MyCourseVo> queryTeacherPracticeCourse(IPage<MyCourseVo> page, MyCourseSearch search) {
         Integer replied = search.getReplied();
         if (replied != null) {
-            //查询所有已评价学生id
-            List<Long> replyStudent = repliedDao.selectReplyStudent();
-            //查询所有购课用户
-            List<Long> userList = paymentDao.selectAll();
-
-            if (CollectionUtils.isEmpty(userList)) {
-                return page.setRecords(new ArrayList<>());
-            }
-
+            search.setStatus(CourseScheduleEnum.COMPLETE.getCode());
+            List<MyCourseVo> list = baseMapper.queryTeacherPracticeCourse(page, monthToDate(search));
             if (replied == 0) {//未评价
-                userList.removeAll(replyStudent);
-                search.setRepliedIds(userList);
+                return page.setRecords(list.stream().filter(s -> {
+                    return s.getTeacherReplied() == 0;
+                }).collect(Collectors.toList()));
             }
 
             if (replied == 1) {//已评价
-                replyStudent.add(Long.valueOf(-1));
-                search.setRepliedIds(replyStudent);
+                return page.setRecords(list.stream().filter(s -> {
+                    return s.getTeacherReplied() == 1;
+                }).collect(Collectors.toList()));
             }
-            search.setStatus(CourseScheduleEnum.COMPLETE.getCode());
         }
+
         return page.setRecords(baseMapper.queryTeacherPracticeCourse(page, monthToDate(search)));
     }
 
@@ -1138,7 +1133,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         String end = sysConfigService.findConfigValue(SysConfigConstant.COURSE_END_SETTING);//系统关课时间
         Date s = DateUtil.strToDate(DateUtil.dateToString(classDate) + " " + star + ":00");
         Date e = DateUtil.strToDate(DateUtil.dateToString(classDate) + " " + end + ":00");
-        if (startTime.before(s)||endTime.after(e)){
+        if (startTime.before(s) || endTime.after(e)) {
             throw new BizException("无法调整该课程");
         }