Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -659,6 +659,15 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         if (replied != null) {
             //按评价筛选 0:未评价 1:已评价
             if (replied == 0) {
+                if (CollectionUtils.isEmpty(studentList)) {
+                    search.setRepliedIds(null);
+                } else {
+                    search.setRepliedIds(studentList);
+                    search.setClassIds(classList);
+                }
+            }
+
+            if (replied == 1) {
                 //查询所有购课用户
                 List<Long> userList = paymentDao.selectAll();
                 //取差集
@@ -668,15 +677,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 }
                 search.setRepliedIds(userList);
             }
-
-            if (replied == 1) {
-                if (CollectionUtils.isEmpty(studentList)) {
-                    search.setRepliedIds(null);
-                } else {
-                    search.setRepliedIds(studentList);
-                    search.setClassIds(classList);
-                }
-            }
         }
         return page.setRecords(baseMapper.queryTeacherPracticeCourse(page, monthToDate(search)));
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleRepliedMapper.xml

@@ -111,6 +111,7 @@
             r.course_group_id_ AS courseGroupId,
             r.score_ AS score,
             r.student_id_ AS studentId,
+            r.student_replied_ AS studentReplied,
             g.subject_id_ AS subjectId,
             sb.name_ AS subjectName,
             s.class_date_ AS classDate,