Browse Source

1、课外训练

Joburgess 5 years ago
parent
commit
faa1a399a1

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -67,6 +67,16 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty(value = "学生评论id")
     private Long StudentReviewId;
 
+    private int isNew;
+
+    public int getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(int isNew) {
+        this.isNew = isNew;
+    }
+
     public List<StudentNameAndPhoneDto> getStudents() {
         return students;
     }

+ 10 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -212,7 +212,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
     @Override
     public List<CourseScheduleDto> findUserPracticeCourses(Integer userId) {
-        return courseScheduleDao.findStudentPracticeCourses(userId);
+        List<CourseScheduleDto> studentPracticeCourses = courseScheduleDao.findStudentPracticeCourses(userId);
+        if(!CollectionUtils.isEmpty(studentPracticeCourses)){
+            studentPracticeCourses.sort(Comparator.comparing(CourseScheduleDto::getStartClassTime));
+            for (CourseScheduleDto studentPracticeCours : studentPracticeCourses) {
+                if(studentPracticeCours.getStartClassTime().after(applyStartDay)){
+                    studentPracticeCours.setIsNew(1);
+                }
+            }
+        }
+        return studentPracticeCourses;
     }
 
     @Override