فهرست منبع

add 网管课导出,vip课导出

周箭河 5 سال پیش
والد
کامیت
8219f7b585
1فایلهای تغییر یافته به همراه8 افزوده شده و 5 حذف شده
  1. 8 5
      mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

+ 8 - 5
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -781,10 +781,13 @@ public class ExportController extends BaseController {
         List<CourseGroupExportDto> totalClassTimes = courseScheduleDao.getStudentCourseScheduleNum(studentIds, GroupType.PRACTICE, null);
         List<CourseGroupExportDto> noStartClassTimes = courseScheduleDao.getStudentCourseScheduleNum(studentIds, GroupType.PRACTICE, CourseStatusEnum.NOT_START);
         for (CourseGroupExportDto practiceGroupExport : practiceGroupExports) {
-            CourseScheduleDto courseScheduleDto = studentCourseSchedulesMap.get(practiceGroupExport.getStudentId()).get(0);
-            practiceGroupExport.setTeacherId(courseScheduleDto.getActualTeacherId());
-            practiceGroupExport.setTeacherName(courseScheduleDto.getTeacherName());
-            practiceGroupExport.setClassEndDate(courseScheduleDto.getStartClassTime());
+            List<CourseScheduleDto> courseScheduleDtos = studentCourseSchedulesMap.get(practiceGroupExport.getStudentId());
+            if (courseScheduleDtos != null && courseScheduleDtos.size() > 0) {
+                CourseScheduleDto courseScheduleDto = courseScheduleDtos.get(0);
+                practiceGroupExport.setTeacherId(courseScheduleDto.getActualTeacherId());
+                practiceGroupExport.setTeacherName(courseScheduleDto.getTeacherName());
+                practiceGroupExport.setClassEndDate(courseScheduleDto.getStartClassTime());
+            }
             for (CourseGroupExportDto studentTotalClassTimes : totalClassTimes) {
                 if (studentTotalClassTimes.getStudentId().equals(practiceGroupExport.getStudentId())) {
                     practiceGroupExport.setTotalClassTimes(studentTotalClassTimes.getTotalClassTimes());
@@ -841,7 +844,7 @@ public class ExportController extends BaseController {
             List<CourseScheduleDto> courseSchedules4Student = studentCourseSchedulesMap.get(vipGroupExport.getStudentId());
             CourseScheduleDto endCourseScheduleDto = null;
             CourseScheduleDto firstCourseSchedule = null;
-            if(courseSchedules4Student != null) {
+            if (courseSchedules4Student != null) {
                 endCourseScheduleDto = courseSchedules4Student.get(0);
                 firstCourseSchedule = courseSchedules4Student.get(courseSchedules4Student.size() - 1);
             }