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

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/dao/SysMusicScoreAccompanimentDao.java

@@ -16,6 +16,8 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<String, SysMusicS
 
     List<SysMusicScoreAccompaniment> queryAccPage(Map<String, Object> params);
 
+    List<SysMusicScoreAccompaniment> queryAccPage1(@Param("musicScoreIds") List<Integer> musicScoreIds);
+
     int findAccCount(Map<String, Object> params);
 
     /**

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/SysMusicScoreAccompanimentService.java

@@ -20,7 +20,7 @@ public interface SysMusicScoreAccompanimentService extends BaseService<String, S
 
     List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
 
-    List<SysMusicScoreAccompaniment> queryAccPage(Map<String, Object> params,List<CbsMusicSheetWrapper.MusicSheetApplication> applications);
+    List<SysMusicScoreAccompaniment> queryAccPage(List<Integer> musicSheetIds,List<CbsMusicSheetWrapper.MusicSheetApplication> applications);
 
     List<SysMusicScoreAccompaniment> queryAccPage(Map<String, Object> params);
 

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

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

@@ -326,8 +326,8 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 	}
 
 	@Override
-	public List<SysMusicScoreAccompaniment> queryAccPage(Map<String, Object> params,List<CbsMusicSheetWrapper.MusicSheetApplication> applications) {
-		return this.initAccompaniment(sysMusicScoreAccompanimentDao.queryAccPage(params),applications);
+	public List<SysMusicScoreAccompaniment> queryAccPage(List<Integer> musicSheetIds,List<CbsMusicSheetWrapper.MusicSheetApplication> applications) {
+		return this.initAccompaniment(sysMusicScoreAccompanimentDao.queryAccPage1(musicSheetIds),applications);
 	}
 
 

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

@@ -162,9 +162,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             if(CollectionUtils.isNotEmpty(applications)){
                 //获取原音
                 List<Integer> musicSheetIds = records.stream().map(SysMusicScore::getId).collect(Collectors.toList());
-                Map<String, Object> params = new HashMap<>();
-                params.put("musicScoreIds", musicSheetIds);
-                List<SysMusicScoreAccompaniment> accompaniments = sysMusicScoreAccompanimentService.queryAccPage(params,applications);
+                List<SysMusicScoreAccompaniment> accompaniments = sysMusicScoreAccompanimentService.queryAccPage(musicSheetIds,applications);
 
                 Map<Long, CbsMusicSheetWrapper.MusicSheetApplication> musicSheetApplicationMap = applications
                         .stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, Function.identity()));

mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -138,6 +138,15 @@
 		<include refid="queryPageSql"/>
 		ORDER BY ses.order_,ses.name_
 	</select>
+	<select id="queryAccPage1" resultMap="SysMusicScoreAccompaniment">
+		SELECT ses.id_ exam_song_id_,ses.name_,ses.type_,ses.url_,ses.cbs_music_categories_id_ categories_id_,ses.metronome_url_,ses.cbs_music_sheet_id_
+		FROM sys_music_score ses
+		where ses.id_ IN
+			<foreach collection="musicScoreIds" separator="," item="item" open="(" close=")">
+				#{item}
+			</foreach>
+		ORDER BY ses.order_,ses.name_
+	</select>
 
 	<select id="findAccCount" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT ses.id_)