Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into feature/0902_courseware

mec-application/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -137,7 +137,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @PostMapping("/getRecentCourseSchedule")
     public HttpResponseResult<CourseScheduleDto> getRecentCourseSchedule(Long courseId){
         CourseScheduleDto courseScheduleDto = scheduleService.getRecentCourseSchedule(sysUserService.getUserId(), courseId);
-        if(courseScheduleDto.getTeachMode() == TeachModeEnum.OFFLINE && courseScheduleDto.getStatus() != CourseStatusEnum.UNDERWAY
+        if(courseScheduleDto != null && courseScheduleDto.getTeachMode() == TeachModeEnum.OFFLINE && courseScheduleDto.getStatus() != CourseStatusEnum.UNDERWAY
                 && StringUtils.isNotEmpty(courseScheduleDto.getCoursewareDetailId())){
             //获取课件详情列表
             R<CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail> voR = coursewareFeignService.lessonCoursewareDetailDetail(Long.parseLong(courseScheduleDto.getCoursewareDetailId()));

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/StudentWrapper.java

@@ -8,7 +8,6 @@ import com.ym.mec.biz.dal.enums.StandardEnum;
 import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -230,4 +229,28 @@ public class StudentWrapper {
         private Integer cooperationOrganId;
 
     }
+
+    @Data
+    @ApiModel("UpdateStudent-学生修改")
+    public static class ClassGroupStudent {
+
+        @ApiModelProperty(value = "学生编号", required = false)
+        private Integer userId;
+
+        @ApiModelProperty(value = "学生姓名", required = false)
+        private String name;
+
+        @ApiModelProperty(value = "性别（0，女  1，男", required = false)
+        private Integer gender;
+
+        @ApiModelProperty(value = "实际科目名称", required = false)
+        private String subjectName;
+
+        @ApiModelProperty(value = "家长电话", required = false)
+        private String parentsPhone;
+
+        @ApiModelProperty(value = "声部课时长", required = false)
+        private Integer singleDuration;
+
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -237,11 +237,13 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         courseHomeworkStudentDetail.setHomeworkOpenFlag(Integer.parseInt(configValue));
         if(StringUtils.isNotEmpty(courseHomeworkStudentDetail.getMusicScoreId())){
             List<SysMusicScore> sysMusicScoreList = sysMusicScoreDao.findByIds(courseHomeworkStudentDetail.getMusicScoreId());
-            courseHomeworkStudentDetail.setSysMusicScoreList(sysMusicScoreList);
-            SysMusicScore sysMusicScore = sysMusicScoreList.get(0);
-            courseHomeworkStudentDetail.setSysMusicScore(sysMusicScore);
-            courseHomeworkStudentDetail.setMusicScoreId(sysMusicScore.getId().toString());
-            courseHomeworkStudentDetail.setMusicScoreName(sysMusicScore.getName());
+            if(CollectionUtils.isNotEmpty(sysMusicScoreList)){
+                courseHomeworkStudentDetail.setSysMusicScoreList(sysMusicScoreList);
+                SysMusicScore sysMusicScore = sysMusicScoreList.get(0);
+                courseHomeworkStudentDetail.setSysMusicScore(sysMusicScore);
+                courseHomeworkStudentDetail.setMusicScoreId(sysMusicScore.getId().toString());
+                courseHomeworkStudentDetail.setMusicScoreName(sysMusicScore.getName());
+            }
         }
         Student student = studentDao.get(userId.intValue());
         courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);