Browse Source

feat:1、服务指标

Joburgess 4 years ago
parent
commit
85592015a3

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

@@ -577,7 +577,11 @@ 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());

+ 7 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServeServiceImpl.java

@@ -413,7 +413,7 @@ public class StudentServeServiceImpl implements StudentServeService {
             }
         }
 
-        if(CollectionUtils.isEmpty(results)){
+        if(!CollectionUtils.isEmpty(results)){
             studentExtracurricularExercisesSituationDao.deleteByMonday(monDayDate.toString());
             BigDecimal currentPage1=BigDecimal.ONE,
                     pageSize1=new BigDecimal(10000),
@@ -661,12 +661,15 @@ public class StudentServeServiceImpl implements StudentServeService {
     public Set<Integer> getStudentWithCourse(Long courseId) {
         CourseSchedule courseSchedule = courseScheduleDao.get(courseId);
         if(Objects.isNull(courseSchedule)){
-            throw new BizException("课程不存在");
+            return new HashSet<>();
         }
         LocalDate nowDate = LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
 
         LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-        studentExtracurricularExercisesSituationDao.findServiceWithCourse(monDayDate.toString(), courseId);
-        return null;
+        List<StudentExtracurricularExercisesSituation> serviceWithCourse = studentExtracurricularExercisesSituationDao.findServiceWithCourse(monDayDate.toString(), courseId);
+        if(CollectionUtils.isEmpty(serviceWithCourse)){
+            return new HashSet<>();
+        }
+        return serviceWithCourse.stream().map(StudentExtracurricularExercisesSituation::getStudentId).collect(Collectors.toSet());
     }
 }

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

@@ -285,6 +285,14 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 						throw new BizException("此课程没有学生");
 					}
+					Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(teacherAttendance.getCourseScheduleId());
+					Iterator<StudentCourseHomework> iterator = studentCourseHomeworks.iterator();
+					while (iterator.hasNext()){
+						StudentCourseHomework next = iterator.next();
+						if(!serveStudentIds.contains(next.getUserId())){
+							iterator.remove();
+						}
+					}
 					studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
 					List<Integer> studentIds = studentCourseHomeworks.stream().map(StudentCourseHomework::getUserId).collect(Collectors.toList());
 					studentServeService.updateExercisesSituation(courseSchedule.getClassDate(), studentIds, teacherAttendance.getTeacherId());