Merge branch 'feature_HW_20230331' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1802,16 +1802,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     .collect(Collectors.toList());
 
             if (!CollectionUtils.isEmpty(tempIds) && schedule.getGroupType() == MUSIC) {
-                List<Map<Integer, String>> studentSubjectNameMaps = subjectDao.findStudentSubjectNameMaps(tempIds);
-                Map<Integer, String> studentSubjectNameMap = MapUtil.convertIntegerMap(studentSubjectNameMaps);
-                List<Map<Integer, Long>> studentSubjectIdMaps = subjectDao.findStudentSubjectIdMaps(tempIds);
-                Map<Integer, Long> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
                 truantStudent.forEach(studentAttendanceViewDto -> {
                     if (Objects.nonNull(studentAttendanceViewDto.getBeMerged()) && studentAttendanceViewDto.getBeMerged()) {
                         studentAttendanceViewDto.setSubjectName("被合并学员");
-                    } else {
-                        studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
-                        studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
                     }
                 });
             } else if (schedule.getGroupType() != MUSIC) {

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

@@ -217,7 +217,7 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
                 String notifyUrl = "evaluating?evaluateId=" + vo.getId();
                 String dateToString = DateUtil.dateToString(vo.getCreateTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_PUSH_LESSON_EXAMINATION_END,
-                        userMap, null, 0, 3 + notifyUrl, "TEACHER", dateToString);
+                        userMap, null, 0, notifyUrl, "TEACHER", dateToString);
             }
             this.lambdaUpdate().in(LessonExamination::getId,examinations)
                     .set(LessonExamination::getPushFlag,true).update();

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;
@@ -816,14 +817,15 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                 }
             }
             for (CourseHomeworkWrapper.CourseHomeworkList courseHomeworkList : courseHomeworkLists) {
-                courseHomeworkList.setAssignFlag(false);
+                courseHomeworkList.setAssignFlag(true);
                 // 如果是未布置的 设置时间
                 if(courseHomeworkList.getHomeWorkStatus().equals(EHomeWorkStatus.UNASSIGNED)){
-                    courseHomeworkList.setAssignFlag(true);
                     courseHomeworkList.setAssignTime(queryInfo.getStartTime());
                     courseHomeworkList.setStudentIdList(groupIds.get(courseHomeworkList.getMusicGroupId()));
                     // 如果结束时间小于当前时间  设置为已过期
-                    if(queryInfo.getEndTime().before(new Date())){
+                    LocalDate now = LocalDate.now();
+                    LocalDate endTime = LocalDate.parse(DateUtil.dateToString(queryInfo.getEndTime()), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                    if(now.isAfter(endTime)){
                         courseHomeworkList.setAssignFlag(false);
                     }
                 }

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -205,12 +205,15 @@
             cssp.be_merged_,
             st.current_grade_num_,
             st.current_class_,
+        s.id_ as subject_id_,
+        s.name_ as subject_name_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
             LEFT JOIN student st ON st.user_id_ = su.id_
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
+        left join subject s on st.subject_id_list_ = s.id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}
             AND su.id_ IS NOT NULL