瀏覽代碼

feat:课后作业布置去掉服务指标限制

Joburgess 4 年之前
父節點
當前提交
3d65fe4b41

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

@@ -552,14 +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();
-            }
-        }
+        //排除不被服务学员
+//        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());

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

@@ -287,14 +287,16 @@ 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();
-						}
-					}
+
+					//排除不被服务学员
+//					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();
+//						}
+//					}
 					courseHomework.setExpectNum(studentCourseHomeworks.size());
 					if(!CollectionUtils.isEmpty(studentCourseHomeworks)){
 						courseHomeworkService.update(courseHomework);