Browse Source

feat:教师端首页课程列表增加是否布置作业标记

Joburgess 4 years ago
parent
commit
4e21b6b4a0

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/StudentServeService.java

@@ -48,10 +48,10 @@ public interface StudentServeService {
      * @author Joburgess
      * @date 2021/4/29 0029
      * @param teacherId:
-     * @param monday:
+     * @param date:
      * @return java.util.Set<java.lang.Long>
      */
-    Set<Long> getTeacherHomeworkCourseIdsWithMonday(Integer teacherId, String monday);
+    Set<Long> getTeacherHomeworkCourseIdsWithMonday(Integer teacherId, Date date);
 
     void updateExercisesSituation(Date date, List<Integer> studentIds, Integer teacherId);
 

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

@@ -1205,7 +1205,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			idCourseReview=AllCourseScheduleReviews.stream().collect(Collectors.groupingBy(CourseScheduleReview::getCourseScheduleId));
 		}
 
-		Set<Long> homeworkCourseIds = studentServeService.getTeacherHomeworkCourseIdsWithMonday(userId, DateUtil.dateToString(classDate, DateUtil.ISO_EXPANDED_DATE_FORMAT));
+		Set<Long> homeworkCourseIds = studentServeService.getTeacherHomeworkCourseIdsWithMonday(userId, classDate);
 
 		for (CourseScheduleDto courseScheduleDto : teacherCourseSchedulesWithDate) {
             Long studentNum = studentNumCourseMap.get(courseScheduleDto.getId());

+ 8 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServeServiceImpl.java

@@ -959,12 +959,18 @@ public class StudentServeServiceImpl implements StudentServeService {
     }
 
     @Override
-    public Set<Long> getTeacherHomeworkCourseIdsWithMonday(Integer teacherId, String monday) {
+    public Set<Long> getTeacherHomeworkCourseIdsWithMonday(Integer teacherId, Date date) {
         Set<Long> courseIds = new HashSet<>();
         if(Objects.isNull(teacherId)){
             return courseIds;
         }
-        List<String> courseIdsStrs = studentExtracurricularExercisesSituationDao.getTeacherHomeworkCourseIdsWithMonday(teacherId, monday);
+        String mondayStr = null;
+        if(Objects.nonNull(date)){
+            Date monday = DateUtil.getWeekMondayWithDate(date);
+            mondayStr = DateUtil.dateToString(monday, DateUtil.ISO_EXPANDED_DATE_FORMAT);
+        }
+
+        List<String> courseIdsStrs = studentExtracurricularExercisesSituationDao.getTeacherHomeworkCourseIdsWithMonday(teacherId, mondayStr);
         if(CollectionUtils.isEmpty(courseIdsStrs)){
             return courseIds;
         }