|
|
@@ -14,8 +14,7 @@ import com.ym.mec.biz.dal.mapper.CourseSchedulePlusMapper;
|
|
|
import com.ym.mec.biz.dal.page.*;
|
|
|
import com.ym.mec.biz.dal.school.dto.ClassesForDayDto;
|
|
|
import com.ym.mec.biz.dal.school.dto.CourseStudentDto;
|
|
|
-import com.ym.mec.biz.dal.school.dto.DailySummaryOfClassesForTheCurrentSemesterDto;
|
|
|
-import com.ym.mec.biz.dal.school.dto.SummaryOfCurrentSemesterCoursesDto;
|
|
|
+import com.ym.mec.biz.dal.wrapper.DailySummaryOfClassesForTheCurrentSemesterWrapper;
|
|
|
import com.ym.mec.biz.dal.wrapper.TeachingPointWrapper;
|
|
|
import com.ym.mec.biz.event.source.CourseEventSource;
|
|
|
import com.ym.mec.biz.event.source.SendSeoMessageSource;
|
|
|
@@ -57,7 +56,6 @@ import java.text.SimpleDateFormat;
|
|
|
import java.time.*;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
|
-import java.time.temporal.IsoFields;
|
|
|
import java.time.temporal.TemporalAdjusters;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -6009,7 +6007,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<SummaryOfCurrentSemesterCoursesDto> getSummaryOfCurrentSemesterCourses(Integer coopId) {
|
|
|
+ public List<DailySummaryOfClassesForTheCurrentSemesterWrapper.SummaryOfCurrentSemesterCoursesDto> getSummaryOfCurrentSemesterCourses(Integer coopId) {
|
|
|
//获取合作单位关联的所有乐团列表
|
|
|
List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(coopId);
|
|
|
if(CollectionUtils.isEmpty(musicGroupIds)){
|
|
|
@@ -6023,14 +6021,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, List<DailySummaryOfClassesForTheCurrentSemesterDto>> getDailySummaryOfClassesForTheCurrentSemester(Integer coopId) {
|
|
|
+ public List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto> getDailySummaryOfClassesForTheCurrentSemester(Integer coopId) {
|
|
|
//获取合作单位关联的所有乐团列表
|
|
|
List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(coopId);
|
|
|
//获取当前学期
|
|
|
Date date = new Date();
|
|
|
String startTerm = DateUtil.getStartTerm(date);
|
|
|
String endTerm = DateUtil.getEndTerm(date);
|
|
|
- List<DailySummaryOfClassesForTheCurrentSemesterDto> summary;
|
|
|
+ List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDto> summary;
|
|
|
if(CollectionUtils.isEmpty(musicGroupIds)){
|
|
|
summary = new ArrayList<>();
|
|
|
}else {
|
|
|
@@ -6039,25 +6037,30 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
LocalDate startDate = LocalDate.parse(startTerm, formatter);
|
|
|
LocalDate endDate = LocalDate.parse(endTerm, formatter);
|
|
|
- Map<String, List<DailySummaryOfClassesForTheCurrentSemesterDto>> result = new LinkedHashMap<>(30);
|
|
|
+ List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto> result = new ArrayList<>();
|
|
|
LocalDate currentWeekStart = startDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
|
|
|
DateTimeFormatter format = DateTimeFormatter.ofPattern("yy年MM月dd日");
|
|
|
StringBuffer sb;
|
|
|
+ int week = 0;
|
|
|
while (!currentWeekStart.isAfter(endDate)) {
|
|
|
- int currentWeekNumber = (int) ChronoUnit.WEEKS.between(startDate, currentWeekStart);
|
|
|
+ DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto vo =
|
|
|
+ new DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterMapDto();
|
|
|
String weekStart = currentWeekStart.format(format);
|
|
|
- sb = new StringBuffer("第").append(toChineseNumber(currentWeekNumber)).append("周 (").append(weekStart).append("-");
|
|
|
+ sb = new StringBuffer("第").append(toChineseNumber(week)).append("周 (").append(weekStart).append("-");
|
|
|
LocalDate currentWeekEnd = currentWeekStart.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY));
|
|
|
String endStart = currentWeekEnd.format(format);
|
|
|
sb.append(endStart).append(")");
|
|
|
- List<DailySummaryOfClassesForTheCurrentSemesterDto> currentWeekDates = new ArrayList<>();
|
|
|
- for (DailySummaryOfClassesForTheCurrentSemesterDto dto : summary) {
|
|
|
+ List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDto> currentWeekDates = new ArrayList<>();
|
|
|
+ for (DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDto dto : summary) {
|
|
|
if (!dto.getCourseDate().isBefore(currentWeekStart) && dto.getCourseDate().isBefore(currentWeekEnd)) {
|
|
|
currentWeekDates.add(dto);
|
|
|
}
|
|
|
}
|
|
|
- result.put(sb.toString(), currentWeekDates);
|
|
|
+ week++;
|
|
|
currentWeekStart = currentWeekEnd.plusDays(1);
|
|
|
+ vo.setWeek(sb.toString());
|
|
|
+ vo.setDailySummaryOfClassesForTheCurrentSemesterDtos(currentWeekDates);
|
|
|
+ result.add(vo);
|
|
|
}
|
|
|
return result;
|
|
|
}
|
zouxuan