Merge branch 'feature_HW_20230331' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentExtracurricularExercisesSituationServiceImpl.java

@@ -39,6 +39,7 @@ import java.math.BigDecimal;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -823,7 +824,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                     courseHomeworkList.setStudentIdList(groupIds.get(courseHomeworkList.getMusicGroupId()));
                     // 如果结束时间小于当前时间  设置为已过期
                     LocalDate now = LocalDate.now();
-                    LocalDate endTime = LocalDate.parse(DateUtil.dateToString(courseHomeworkList.getEndTime()));
+                    LocalDate endTime = LocalDate.parse(DateUtil.dateToString(queryInfo.getEndTime()), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
                     if(now.isAfter(endTime)){
                         courseHomeworkList.setAssignFlag(false);
                     }