feat:1、课酬标记

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

@@ -1,12 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ym.mec.biz.dal.dao.*;
@@ -558,6 +552,15 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         CourseHomework courseHomework = new CourseHomework();
         List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseSchedule.getId());
 
+        Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(courseSchedule.getId());
+        Iterator<CourseScheduleStudentPayment> iterator = courseScheduleStudentPayments.iterator();
+        while (iterator.hasNext()){
+            CourseScheduleStudentPayment courseScheduleStudentPayment = iterator.next();
+            if(!serveStudentIds.contains(courseScheduleStudentPayment.getUserId())){
+                iterator.remove();
+            }
+        }
+
         if (Objects.nonNull(existHomework)) {
             courseHomework.setId(existHomework.getId());
             courseHomework.setContent(content);
@@ -577,11 +580,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
         if (!CollectionUtils.isEmpty(courseScheduleStudentPayments)) {
             Teacher teacher = teacherDao.get(courseSchedule.getActualTeacherId());
             String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 3), "MM月dd日");
-            Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(courseSchedule.getId());
             for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
-                if(!serveStudentIds.contains(courseScheduleStudentPayment.getUserId())){
-                    continue;
-                }
                 StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
                 if (Objects.isNull(existHomework)) {
                     studentCourseHomework.setCourseHomeworkId(courseHomework.getId());

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

@@ -171,6 +171,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			dataList = extracurricularExercisesReplyDao.findStudentHomeworkDetailsInTimeZone(params);
 			Map<String, List<StudentServiceDetailDto>> weekHomeworks=new HashMap<>();
 			for (StudentServiceDetailDto studentServiceDetailDto : dataList) {
+				if(Objects.isNull(studentServiceDetailDto.getCourseStartTime())){
+					continue;
+				}
 				LocalDate homeworkCreateTime = LocalDateTime.ofInstant(studentServiceDetailDto.getCourseStartTime().toInstant(), DateUtil.zoneId).toLocalDate();
 				String mondayStr = homeworkCreateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()).toString();
 				if(!weekHomeworks.containsKey(mondayStr)){

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

@@ -277,8 +277,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					courseHomework.setGroupType(teacherAttendance.getGroupType());
 					courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
 					courseHomework.setExpiryDate(DateUtil.addDays(date,7));
-					courseHomework.setExpectNum(courseScheduleDao.countCourseStudentNum(teacherAttendance.getCourseScheduleId()));
-					courseHomeworkService.insert(courseHomework);
+
 					List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
 							.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
 									courseHomework.getId());
@@ -293,6 +292,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 							iterator.remove();
 						}
 					}
+
+					courseHomework.setExpectNum(studentCourseHomeworks.size());
+					courseHomeworkService.insert(courseHomework);
+
 					studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
 					List<Integer> studentIds = studentCourseHomeworks.stream().map(StudentCourseHomework::getUserId).collect(Collectors.toList());
 					studentServeService.updateExercisesSituation(courseSchedule.getClassDate(), studentIds, teacherAttendance.getTeacherId());