Browse Source

feat:课后作业布置去掉服务指标限制,下发给所有学员

Joburgess 4 năm trước cách đây
mục cha
commit
8d118ab5fc

+ 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());

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

@@ -287,14 +287,15 @@ 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);

+ 1 - 1
mec-teacher/src/main/resources/bootstrap-test.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=47.114.1.200:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f9d46b0a-9847-48ae-8e4b-216c7a3eb466
+spring.cloud.nacos.config.namespace=f753d9d9-4bb2-4df6-a483-da9e169617c4
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}