瀏覽代碼

1、服务指标;
2、增加课外训练待布置学员列表;
3、网管课续费提醒;

Joburgess 5 年之前
父節點
當前提交
ae73cfd337

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

@@ -160,7 +160,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			dataList = extracurricularExercisesReplyDao.findStudentHomeworkDetailsInTimeZone(params);
 			Map<String, List<StudentServiceDetailDto>> weekHomeworks=new HashMap<>();
 			for (StudentServiceDetailDto studentServiceDetailDto : dataList) {
-				LocalDate homeworkCreateTime = LocalDateTime.ofInstant(studentServiceDetailDto.getHomeworkCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
+				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)){
 					weekHomeworks.put(mondayStr, new ArrayList<>());

+ 1 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServeServiceImpl.java

@@ -85,12 +85,7 @@ public class StudentServeServiceImpl implements StudentServeService {
                 continue;
             }
             if(studentServeDto.getCourseStartTime().after(nextMonday)){
-                long pvc=haveCourseStudents.stream().filter(e -> (GroupType.PRACTICE.equals(e.getGroupType())||GroupType.VIP.equals(e.getGroupType()))).count();
-                if(pvc>0){
-                    dontServeInCurrentWeekStudentIds.add(studentCoursesEntry.getKey());
-                }else{
-                    noClassStudentIds.add(studentCoursesEntry.getKey());
-                }
+                dontServeInCurrentWeekStudentIds.add(studentCoursesEntry.getKey());
                 continue;
             }
             long count = haveCourseStudents.stream().filter(e -> (GroupType.PRACTICE.equals(e.getGroupType()) ||

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesReplyMapper.xml

@@ -413,7 +413,7 @@
 			NULL group_id_,
 			NULL group_type_,
 			NULL group_name_,
-			NULL course_start_time_,
+			ee.create_time_ course_start_time_,
 			NULL course_end_time_,
 			ee.content_,
 			ee.create_time_ homework_create_time_,

+ 1 - 0
mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -400,6 +400,7 @@
             student s
             LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = s.user_id_
             LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
+            AND cs.group_type_ IN ('VIP', 'PRACTICE')
             AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) > #{monday}
         WHERE
             s.service_tag_ = 1