作业布置优化

1、学员声部去除字符串拼接，优化为单声部
2、新增课程学员列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -552,4 +552,10 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
     int getHasVPCourseStudentNum(@Param("organId") Integer organId);
     List<Map<Integer, Integer>> getOrganHasVPCourseStudentNum(@Param("organIds") List<Integer> organIds);
 
+    /**
+     * 获取课程学员列表
+     * @param courseScheduleId
+     * @return
+     */
+    List<BasicUserDto> getCourseStudents(@Param("courseScheduleId") Long courseScheduleId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentCourseHomeworkDao.java

@@ -55,7 +55,8 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
      */
     List<StudentCourseHomework> constructInitialStudentHomeworkRecordsWithPayment(@Param("courseScheduleID") Long courseScheduleID,
                                                                                   @Param("courseHomeworkID") Long courseHomeworkID,
-                                                                                  @Param("musicScoreId") Integer musicScoreId);
+                                                                                  @Param("musicScoreId") String musicScoreId,
+                                                                                  @Param("userIdList") List<Integer> userIdList);
 
     /**
      * @param courseScheduleId: 作业编号

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicScoreDao.java

@@ -3,7 +3,11 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface SysMusicScoreDao extends BaseDAO<Integer, SysMusicScore> {
 
+    List<SysMusicScore> findByIds(@Param("musicScoreIds") String musicScoreIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BasicUserDto.java

@@ -34,6 +34,26 @@ public class BasicUserDto {
     @ApiModelProperty(value = "加油包：0：默认不可用；1：可用；2：已使用;")
     private Integer comeOnPackage;
 
+    private Integer memberRankSettingId;
+
+    private String subjectIdList;
+
+    public Integer getMemberRankSettingId() {
+        return memberRankSettingId;
+    }
+
+    public void setMemberRankSettingId(Integer memberRankSettingId) {
+        this.memberRankSettingId = memberRankSettingId;
+    }
+
+    public String getSubjectIdList() {
+        return subjectIdList;
+    }
+
+    public void setSubjectIdList(String subjectIdList) {
+        this.subjectIdList = subjectIdList;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkStudentDetailDto.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author Joburgess
@@ -59,7 +60,7 @@ public class CourseHomeworkStudentDetailDto {
     private String teacherName;
 
     @ApiModelProperty(value = "伴奏编号",required = false)
-    private Integer musicScoreId;
+    private String musicScoreId;
 
     private String musicScoreName;
 
@@ -69,6 +70,8 @@ public class CourseHomeworkStudentDetailDto {
 
     private SysMusicScore sysMusicScore;
 
+    private List<SysMusicScore> sysMusicScoreList;
+
     public SysMusicScore getSysMusicScore() {
         return sysMusicScore;
     }
@@ -77,6 +80,14 @@ public class CourseHomeworkStudentDetailDto {
         this.sysMusicScore = sysMusicScore;
     }
 
+    public List<SysMusicScore> getSysMusicScoreList() {
+        return sysMusicScoreList;
+    }
+
+    public void setSysMusicScoreList(List<SysMusicScore> sysMusicScoreList) {
+        this.sysMusicScoreList = sysMusicScoreList;
+    }
+
     public Integer getHasMember() {
         return hasMember;
     }
@@ -96,11 +107,11 @@ public class CourseHomeworkStudentDetailDto {
         this.homeworkOpenFlag = homeworkOpenFlag;
     }
 
-    public Integer getMusicScoreId() {
+    public String getMusicScoreId() {
         return musicScoreId;
     }
 
-    public void setMusicScoreId(Integer musicScoreId) {
+    public void setMusicScoreId(String musicScoreId) {
         this.musicScoreId = musicScoreId;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ExtraExerciseStudentsDto.java

@@ -17,7 +17,7 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
 
     private String teacherName;
 
-    private Integer musicScoreId;
+    private String musicScoreId;
 
     private String musicScoreName;
 
@@ -41,11 +41,11 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
 
     private String existVipCourseStr;
 
-    public Integer getMusicScoreId() {
+    public String getMusicScoreId() {
         return musicScoreId;
     }
 
-    public void setMusicScoreId(Integer musicScoreId) {
+    public void setMusicScoreId(String musicScoreId) {
         this.musicScoreId = musicScoreId;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicScoreSubjectDto.java

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.util.List;
+
+public class MusicScoreSubjectDto {
+
+    private Integer subjectId;
+
+    private List<Integer> userIdList;
+
+    private List<Integer> musicScoreIdList;
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public List<Integer> getUserIdList() {
+        return userIdList;
+    }
+
+    public void setUserIdList(List<Integer> userIdList) {
+        this.userIdList = userIdList;
+    }
+
+    public List<Integer> getMusicScoreIdList() {
+        return musicScoreIdList;
+    }
+
+    public void setMusicScoreIdList(List<Integer> musicScoreIdList) {
+        this.musicScoreIdList = musicScoreIdList;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseHomework.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -7,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import com.ym.mec.biz.dal.enums.GroupType;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 对应数据库表(course_homework):
@@ -53,13 +55,23 @@ public class CourseHomework {
 	private Integer expectNum;
 
 	@ApiModelProperty(value = "伴奏编号",required = false)
-	private Integer musicScoreId;
+	private String musicScoreId;
 
-	public Integer getMusicScoreId() {
+	private List<MusicScoreSubjectDto> musicScoreSubjectDto;
+
+	public List<MusicScoreSubjectDto> getMusicScoreSubjectDto() {
+		return musicScoreSubjectDto;
+	}
+
+	public void setMusicScoreSubjectDto(List<MusicScoreSubjectDto> musicScoreSubjectDto) {
+		this.musicScoreSubjectDto = musicScoreSubjectDto;
+	}
+
+	public String getMusicScoreId() {
 		return musicScoreId;
 	}
 
-	public void setMusicScoreId(Integer musicScoreId) {
+	public void setMusicScoreId(String musicScoreId) {
 		this.musicScoreId = musicScoreId;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercises.java

@@ -1,10 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.auth.api.entity.SysUser;
 
+import java.util.List;
+
 /**
  * 对应数据库表(extracurricular_exercises):
  */
@@ -58,10 +61,21 @@ public class ExtracurricularExercises {
 
 	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
-	private Integer musicScoreId;
+	/** 伴奏列表（多个用逗号分隔） */
+	private String musicScoreId;
 
 	private String musicScoreName;
 
+	private List<MusicScoreSubjectDto> musicScoreSubjectDtos;
+
+	public List<MusicScoreSubjectDto> getMusicScoreSubjectDtos() {
+		return musicScoreSubjectDtos;
+	}
+
+	public void setMusicScoreSubjectDtos(List<MusicScoreSubjectDto> musicScoreSubjectDtos) {
+		this.musicScoreSubjectDtos = musicScoreSubjectDtos;
+	}
+
 	public String getMusicScoreName() {
 		return musicScoreName;
 	}
@@ -70,11 +84,11 @@ public class ExtracurricularExercises {
 		this.musicScoreName = musicScoreName;
 	}
 
-	public Integer getMusicScoreId() {
+	public String getMusicScoreId() {
 		return musicScoreId;
 	}
 
-	public void setMusicScoreId(Integer musicScoreId) {
+	public void setMusicScoreId(String musicScoreId) {
 		this.musicScoreId = musicScoreId;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercisesReply.java

@@ -51,6 +51,16 @@ public class ExtracurricularExercisesReply {
 
 	private Date submitTime;
 
+	private String musicScoreId;
+
+	public String getMusicScoreId() {
+		return musicScoreId;
+	}
+
+	public void setMusicScoreId(String musicScoreId) {
+		this.musicScoreId = musicScoreId;
+	}
+
 	public Integer getIsRepliedTimely() {
 		return isRepliedTimely;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupMember.java

@@ -23,6 +23,10 @@ public class ImGroupMember {
 	
 	/** 群角色 */
 	private String roleType;
+
+	private Integer memberRankSettingId;
+
+	private String subjectName;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -30,6 +34,22 @@ public class ImGroupMember {
 	/**  */
 	private java.util.Date updateTime;
 
+	public Integer getMemberRankSettingId() {
+		return memberRankSettingId;
+	}
+
+	public void setMemberRankSettingId(Integer memberRankSettingId) {
+		this.memberRankSettingId = memberRankSettingId;
+	}
+
+	public String getSubjectName() {
+		return subjectName;
+	}
+
+	public void setSubjectName(String subjectName) {
+		this.subjectName = subjectName;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImUserFriend.java

@@ -23,12 +23,32 @@ public class ImUserFriend {
 	
 	private String tags;
 
+	private Integer memberRankSettingId;
+
+	private String subjectName;
+
 	/**  */
 	private java.util.Date createTime;
 
 	/**  */
 	private java.util.Date updateTime;
 
+	public Integer getMemberRankSettingId() {
+		return memberRankSettingId;
+	}
+
+	public void setMemberRankSettingId(Integer memberRankSettingId) {
+		this.memberRankSettingId = memberRankSettingId;
+	}
+
+	public String getSubjectName() {
+		return subjectName;
+	}
+
+	public void setSubjectName(String subjectName) {
+		this.subjectName = subjectName;
+	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentCourseHomework.java

@@ -55,7 +55,7 @@ public class StudentCourseHomework {
 	private ImSendTypeEnum msgType = ImSendTypeEnum.TXT;
 
 	//伴奏编号
-	private Integer musicScoreId;
+	private String musicScoreId;
 	//伴奏编号
 	private String musicScoreName;
 
@@ -67,11 +67,11 @@ public class StudentCourseHomework {
 		this.musicScoreName = musicScoreName;
 	}
 
-	public Integer getMusicScoreId() {
+	public String getMusicScoreId() {
 		return musicScoreId;
 	}
 
-	public void setMusicScoreId(Integer musicScoreId) {
+	public void setMusicScoreId(String musicScoreId) {
 		this.musicScoreId = musicScoreId;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/service/CourseReviewService.java

@@ -105,7 +105,7 @@ public interface CourseReviewService extends BaseService<Integer, CourseSchedule
 	 * @param expiryDate
 	 * @return
 	 */
-	CourseHomework addHomeWork(Integer courseScheduleId,String content, Date expiryDate,Integer musicScoreId);
+	CourseHomework addHomeWork(Integer courseScheduleId,String content, Date expiryDate,String musicScoreId);
 
 	/**
 	 * 获取网管课列表

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.StudentCourseHomeworkDao;
 import com.ym.mec.biz.dal.dao.StudentCourseHomeworkReplyDao;
 import com.ym.mec.biz.dal.dto.Mapper;
+import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 import com.ym.mec.biz.dal.dto.TeacherHomeworkListDto;
 import com.ym.mec.biz.dal.dto.WebCourseHomeworkListDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
@@ -79,9 +80,23 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 			oldCourseHomework.setExpiryDate(DateUtil.addDays(date,7));
 			oldCourseHomework.setExpectNum(courseScheduleDao.countCourseStudentNum(courseSchedule.getId()));
 			courseHomeworkDao.insert(oldCourseHomework);
-			List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
-					.constructInitialStudentHomeworkRecordsWithPayment(courseSchedule.getId(),
-							oldCourseHomework.getId(),oldCourseHomework.getMusicScoreId());
+			List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
+
+			//获取按学员声部发放的作业
+			List<MusicScoreSubjectDto> musicScoreSubjectDto = courseHomework.getMusicScoreSubjectDto();
+			if(musicScoreSubjectDto != null && musicScoreSubjectDto.size() > 0){
+				for (MusicScoreSubjectDto scoreSubjectDto : musicScoreSubjectDto) {
+					studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(courseSchedule.getId(),
+							oldCourseHomework.getId(),
+							StringUtils.join(scoreSubjectDto.getMusicScoreIdList(),","),
+							scoreSubjectDto.getUserIdList()));
+				}
+			}else {
+				studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(courseSchedule.getId(),
+						oldCourseHomework.getId(),
+						oldCourseHomework.getMusicScoreId(),
+						null));
+			}
 			if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 				throw new BizException("此课程没有学生");
 			}

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

@@ -532,7 +532,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
 
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public CourseHomework addHomeWork(Integer courseScheduleId, String content, Date expiryDate,Integer musicScoreId) {
+    public CourseHomework addHomeWork(Integer courseScheduleId, String content, Date expiryDate,String musicScoreId) {
         if (StringUtils.isBlank(content)) {
             throw new BizException("作业内容不能为空");
         }
@@ -566,10 +566,8 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             courseHomework.setId(existHomework.getId());
             courseHomework.setContent(content);
             courseHomework.setExpiryDate(expiryDate);
-            courseHomework.setMusicScoreId(musicScoreId);
             courseHomeworkService.update(courseHomework);
         } else {
-            courseHomework.setMusicScoreId(musicScoreId);
             courseHomework.setContent(content);
             courseHomework.setCourseScheduleId(courseSchedule.getId());
             courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());

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

@@ -234,22 +234,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(planList.size() >= courseNumNo){
 			currentCourseDetail.setCoursePlan(planList.get(courseNumNo - 1).getPlan());
 		}
-		//获取有会员的学员数
-//		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
-//		if(StringUtils.isEmpty(configValue)){
-//			configValue = "0";
-//		}
-//		if(configValue.equals("0")){
-//			currentCourseDetail.setMemberNum(0);
-//		}else {
-//			CourseSchedule courseSchedule = courseScheduleDao.get(courseID);
-//			MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
-//			if(musicGroup != null){
-//				currentCourseDetail.setCourseViewType(musicGroup.getCourseViewType());
-//			}
-//			List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseID);
-//			currentCourseDetail.setMemberNum(studentDao.getMemberNum(StringUtils.join(students, ",")));
-//		}
 		return currentCourseDetail;
     }
 

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

@@ -105,23 +105,26 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		detail.setStudentName(extraExerciseReply.getStudentName());
 		detail.setExpiryDate(extraExerciseReply.getExpireDate());
 		detail.setType("EXTRA");
-		if(extraExerciseReply.getMusicScoreId() != null){
-			detail.setSysMusicScore(sysMusicScoreDao.get(extraExerciseReply.getMusicScoreId()));
-		}
 
-		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
-		if(StringUtils.isEmpty(configValue)){
-			configValue = "0";
-		}
-		detail.setHomeworkOpenFlag(Integer.parseInt(configValue));
-		if(configValue.equals("0")){
-			detail.setHasMember(0);
-		}else {
-			detail.setMusicScoreId(extraExerciseReply.getMusicScoreId());
-			detail.setMusicScoreName(extraExerciseReply.getMusicScoreName());
-			Student student = studentDao.get(extraExerciseReply.getUserId());
-			detail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+//		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+//		if(StringUtils.isEmpty(configValue)){
+//			configValue = "0";
+//		}
+//		detail.setHomeworkOpenFlag(Integer.parseInt(configValue));
+//		if(configValue.equals("0")){
+//			detail.setHasMember(0);
+//		}else {
+		if(StringUtils.isNotEmpty(extraExerciseReply.getMusicScoreId())){
+			List<SysMusicScore> sysMusicScores = sysMusicScoreDao.findByIds(extraExerciseReply.getMusicScoreId());
+			detail.setSysMusicScoreList(sysMusicScores);
+			SysMusicScore sysMusicScore = sysMusicScores.get(0);
+			detail.setSysMusicScore(sysMusicScore);
+			detail.setMusicScoreId(sysMusicScore.getId().toString());
+			detail.setMusicScoreName(sysMusicScore.getName());
 		}
+		Student student = studentDao.get(extraExerciseReply.getUserId());
+		detail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+//		}
 		return detail;
 	}
 
@@ -173,10 +176,10 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		existExtra.setSubmitTime(new Date());
 		extracurricularExercisesReplyDao.update(existExtra);
 
-		LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
-		LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-		LocalDate createDateTime = LocalDateTime.ofInstant(existExtra.getCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
-		LocalDate createMonday = createDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+//		LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+//		LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+//		LocalDate createDateTime = LocalDateTime.ofInstant(existExtra.getCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
+//		LocalDate createMonday = createDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
 
 		int submitStudentNum=extracurricularExercisesReplyDao.countIsSubmitStudents(existExtra.getExtracurricularExercisesId());
 		extracurricularExercises.setCompletedNum(submitStudentNum);

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dao.ExtracurricularExercisesReplyDao;
 import com.ym.mec.biz.dal.dao.StudentExtracurricularExercisesSituationDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply;
@@ -87,6 +88,14 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 		exercises.setExpectNum(studentIds.size());
 		extracurricularExercisesDao.insert(exercises);
 		String dateStr = DateUtil.dateToString(exercises.getExpireDate(), "MM月dd日HH点");
+
+		List<MusicScoreSubjectDto> scoreSubjectDtoList = exercises.getMusicScoreSubjectDtos();
+		Map<List<Integer>, List<MusicScoreSubjectDto>> collect = null;
+		Set<List<Integer>> lists = null;
+		if(!CollectionUtils.isEmpty(scoreSubjectDtoList)){
+			collect = scoreSubjectDtoList.stream().collect(Collectors.groupingBy(e -> e.getUserIdList()));
+			lists = collect.keySet();
+		}
 		for (Integer studentId : studentIds) {
 			ExtracurricularExercisesReply studentExtraExercise=new ExtracurricularExercisesReply();
 			studentExtraExercise.setExtracurricularExercisesId(exercises.getId());
@@ -95,6 +104,16 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 			studentExtraExercise.setIsReplied(0);
 			studentExtraExercise.setIsView(0);
 			studentExtraExercise.setIsRepliedTimely(0);
+			studentExtraExercise.setMusicScoreId(exercises.getMusicScoreId());
+			if(!CollectionUtils.isEmpty(scoreSubjectDtoList)){
+				for (List<Integer> list : lists) {
+					if(list.contains(studentId)){
+						MusicScoreSubjectDto musicScoreSubjectDto = collect.get(list).get(0);
+						studentExtraExercise.setMusicScoreId(StringUtils.join(musicScoreSubjectDto.getMusicScoreIdList(),","));
+						break;
+					}
+				}
+			}
 			extracurricularExercisesReplyDao.insert(studentExtraExercise);
 
 			String notifyUrl = "?courseScheduleID=" + studentExtraExercise.getId() + "&studentCourseHomeworkId=" + studentExtraExercise.getId() + "&extra=1";

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

@@ -2059,16 +2059,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             student.setOperatingTag(1);
             studentDao.insert(student);
         } else {
-            if (Objects.isNull(student.getSubjectIdList())) {
-                student.setSubjectIdList(practiceGroup.getSubjectId().toString());
-            } else {
-                String[] studentIdStrings = student.getSubjectIdList().split(",");
-                List<String> studentIds = new ArrayList<>(Arrays.asList(studentIdStrings));
-                if (!studentIds.contains(practiceGroup.getSubjectId().toString())) {
-                    studentIds.add(practiceGroup.getSubjectId().toString());
-                }
-                student.setSubjectIdList(StringUtils.join(studentIds.toArray(), ","));
-            }
+            student.setSubjectIdList(practiceGroup.getSubjectId().toString());
             studentDao.update(student);
         }
 

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

@@ -128,29 +128,29 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
         courseHomeworkService.update(courseHomework);
 
-        LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
-        LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-        LocalDate createDateTime = LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
-        LocalDate createMonday = createDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-        LocalDate homeworkCreateDateTime = LocalDateTime.ofInstant(existHomework.getCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
-        boolean isOk = false;
-        switch (createDateTime.getDayOfWeek()) {
-            case SATURDAY:
-                if (createDateTime.until(homeworkCreateDateTime, ChronoUnit.DAYS) < 4) {
-                    isOk = true;
-                }
-                break;
-            case SUNDAY:
-                if (createDateTime.until(homeworkCreateDateTime, ChronoUnit.DAYS) < 3) {
-                    isOk = true;
-                }
-                break;
-            default:
-                if (createDateTime.get(DateUtil.weekFields.weekOfYear()) == homeworkCreateDateTime.get(DateUtil.weekFields.weekOfYear())) {
-                    isOk = true;
-                }
-                break;
-        }
+//        LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+//        LocalDate monDayDate = nowDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+//        LocalDate createDateTime = LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
+//        LocalDate createMonday = createDateTime.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+//        LocalDate homeworkCreateDateTime = LocalDateTime.ofInstant(existHomework.getCreateTime().toInstant(), DateUtil.zoneId).toLocalDate();
+//        boolean isOk = false;
+//        switch (createDateTime.getDayOfWeek()) {
+//            case SATURDAY:
+//                if (createDateTime.until(homeworkCreateDateTime, ChronoUnit.DAYS) < 4) {
+//                    isOk = true;
+//                }
+//                break;
+//            case SUNDAY:
+//                if (createDateTime.until(homeworkCreateDateTime, ChronoUnit.DAYS) < 3) {
+//                    isOk = true;
+//                }
+//                break;
+//            default:
+//                if (createDateTime.get(DateUtil.weekFields.weekOfYear()) == homeworkCreateDateTime.get(DateUtil.weekFields.weekOfYear())) {
+//                    isOk = true;
+//                }
+//                break;
+//        }
 
         studentServeService.updateExercisesSituation(courseSchedule.getClassDate(), new ArrayList<>(Arrays.asList(bean.getUserId())), courseSchedule.getTeacherId());
 
@@ -200,34 +200,40 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             throw new BizException("作业不存在");
         }
         CourseHomeworkStudentDetailDto courseHomeworkStudentDetail = studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
-        if (Objects.nonNull(courseHomeworkStudentDetail)) {
-            SysUser student = teacherDao.getUser(userId.intValue());
-            courseHomeworkStudentDetail.setStudentId(userId.intValue());
-            courseHomeworkStudentDetail.setStudentName(student.getUsername());
-            CourseSchedule courseSchedule = courseScheduleDao.get(courseHomeworkStudentDetail.getCourseScheduleId());
-            if (Objects.nonNull(courseSchedule)) {
-                SysUser teacher = teacherDao.getUser(courseSchedule.getActualTeacherId());
-                courseHomeworkStudentDetail.setTeacherId(courseSchedule.getActualTeacherId());
-                courseHomeworkStudentDetail.setTeacherName(teacher.getRealName());
-            }
-            if(courseHomeworkStudentDetail.getMusicScoreId() != null){
-                courseHomeworkStudentDetail.setSysMusicScore(sysMusicScoreDao.get(courseHomeworkStudentDetail.getMusicScoreId()));
-            }
+        if(courseHomeworkStudentDetail == null){
+            throw new BizException("作业不存在");
         }
-        courseHomeworkStudentDetail.setType("HOMEWORK");
-        String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
-        if(StringUtils.isEmpty(configValue)){
-            configValue = "0";
+        SysUser sysUser = teacherDao.getUser(userId.intValue());
+        courseHomeworkStudentDetail.setStudentId(userId.intValue());
+        courseHomeworkStudentDetail.setStudentName(sysUser.getUsername());
+        CourseSchedule courseSchedule = courseScheduleDao.get(courseHomeworkStudentDetail.getCourseScheduleId());
+        if (Objects.nonNull(courseSchedule)) {
+            SysUser teacher = teacherDao.getUser(courseSchedule.getActualTeacherId());
+            courseHomeworkStudentDetail.setTeacherId(courseSchedule.getActualTeacherId());
+            courseHomeworkStudentDetail.setTeacherName(teacher.getRealName());
         }
-        courseHomeworkStudentDetail.setHomeworkOpenFlag(Integer.parseInt(configValue));
-        if(configValue.equals("0")){
-            courseHomeworkStudentDetail.setMusicScoreId(null);
-            courseHomeworkStudentDetail.setMusicScoreName(null);
-            courseHomeworkStudentDetail.setHasMember(0);
-        }else {
-            Student student = studentDao.get(userId.intValue());
-            courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+        courseHomeworkStudentDetail.setType("HOMEWORK");
+//        String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
+//        if(StringUtils.isEmpty(configValue)){
+//            configValue = "0";
+//        }
+//        courseHomeworkStudentDetail.setHomeworkOpenFlag(Integer.parseInt(configValue));
+//        if(configValue.equals("0")){
+//            courseHomeworkStudentDetail.setMusicScoreId(null);
+//            courseHomeworkStudentDetail.setMusicScoreName(null);
+//            courseHomeworkStudentDetail.setHasMember(0);
+//        }else {
+        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());
         }
+        Student student = studentDao.get(userId.intValue());
+        courseHomeworkStudentDetail.setHasMember(student.getMemberRankSettingId()==null?0:1);
+//        }
         return courseHomeworkStudentDetail;
     }
 

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

@@ -895,19 +895,10 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             Student student = studentDao.get(userId);
             if (student == null) {
                 studentDao.insert(new Student(userId, studentRegistration.getSubjectId().toString()));
-            } else if (StringUtils.isEmpty(student.getSubjectIdList())) {
+            } else {
                 student.setSubjectIdList(studentRegistration.getSubjectId().toString());
                 student.setUpdateTime(date);
                 studentDao.update(student);
-            } else if (StringUtils.isNotEmpty(student.getSubjectIdList())) {
-                String[] split = student.getSubjectIdList().split(",");
-                List<String> list = new ArrayList<>(Arrays.asList(split));
-                if (!list.contains(studentRegistration.getSubjectId().toString())) {
-                    list.add(studentRegistration.getSubjectId().toString());
-                    student.setSubjectIdList(StringUtils.join(list, ","));
-                    student.setUpdateTime(date);
-                    studentDao.update(student);
-                }
             }
             imGroupDao.updateNickname(userId, sysUser.getUsername());
             imGroupDao.updateUserFriendNickname(userId, sysUser.getUsername());

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

@@ -282,9 +282,23 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					courseHomework.setExpiryDate(DateUtil.addDays(date,7));
 
 					courseHomeworkService.insert(courseHomework);
-
-					List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
-							.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),courseHomework.getId(),courseHomework.getMusicScoreId());
+					List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
+
+					//获取按学员声部发放的作业
+					List<MusicScoreSubjectDto> musicScoreSubjectDto = courseHomework.getMusicScoreSubjectDto();
+					if(musicScoreSubjectDto != null && musicScoreSubjectDto.size() > 0){
+						for (MusicScoreSubjectDto scoreSubjectDto : musicScoreSubjectDto) {
+							studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
+									courseHomework.getId(),
+									StringUtils.join(scoreSubjectDto.getMusicScoreIdList(),","),
+									scoreSubjectDto.getUserIdList()));
+						}
+					}else {
+						studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
+								courseHomework.getId(),
+								courseHomework.getMusicScoreId(),
+								null));
+					}
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 						throw new BizException("此课程没有学生");
 					}

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

@@ -813,4 +813,12 @@
 		GROUP BY
 			su.organ_id_
 	</select>
+    <select id="getCourseStudents" resultType="com.ym.mec.biz.dal.dto.BasicUserDto">
+		SELECT cssp.user_id_ userId,st.member_rank_setting_id_,s.name_ subjectName,su.avatar_ headUrl,su.username_ name,st.subject_id_list_
+		FROM course_schedule_student_payment cssp
+		LEFT JOIN sys_user su ON su.id_ = cssp.user_id_
+		LEFT JOIN student st ON st.user_id_ = cssp.user_id_
+		LEFT JOIN `subject` s ON s.id_ = st.subject_id_list_
+		WHERE cssp.course_schedule_id_ = #{courseScheduleId}
+	</select>
 </mapper>

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

@@ -21,8 +21,6 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="organ_name_" property="organName" />
-		<result column="music_score_id_" property="musicScoreId" />
-		<result column="music_score_name_" property="musicScoreName"/>
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -61,18 +59,15 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercises" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises (teacher_id_,student_id_list_,batch_no_,
-		                                       title_,attachments_,content_,expire_date_,completed_num_,expect_num_,create_time_,update_time_,music_score_id_)
+		                                       title_,attachments_,content_,expire_date_,completed_num_,expect_num_,create_time_,update_time_)
 		VALUES(#{teacherId},#{studentIdList},#{batchNo},#{title},#{attachments},
-		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW(),#{musicScoreId})
+		       #{content},#{expireDate},#{completedNum},#{expectNum},NOW(), NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercises">
 		UPDATE extracurricular_exercises
 		<set>
-			<if test="musicScoreId != null">
-				music_score_id_ = #{musicScoreId},
-			</if>
 			<if test="studentIdList != null">
 			student_id_list_ = #{studentIdList},
 			</if>
@@ -165,7 +160,9 @@
 			su.id_ userId,
 			su.username_ name,
 			su.avatar_ headUrl,
-			GROUP_CONCAT(sub.name_) subjectName
+			GROUP_CONCAT(sub.name_) subjectName,
+		    stu.member_rank_setting_id_,
+			stu.subject_id_list_
 		FROM
 			student_extracurricular_exercises_situation_ sees
 			<if test="musicGroupId!=null and musicGroupId!=''">

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

@@ -35,7 +35,6 @@
 		<result column="content_" property="content"/>
 		<result column="expire_date_" property="expireDate"/>
 		<result column="music_score_id_" property="musicScoreId" />
-		<result column="music_score_name_" property="musicScoreName"/>
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -88,11 +87,6 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_)
 		VALUES(#{extracurricularExercisesId},#{userId},#{attachments},NOW(),NOW(),#{remark},#{status},#{isReplied},#{isView},#{isRepliedTimely})
 	</insert>
@@ -200,12 +194,10 @@
 			ee.expire_date_,
 			ee.teacher_id_,
 			ee.music_score_id_,
-			sms.name_ music_score_name_,
 			su.username_ student_name_
 		FROM
 			extracurricular_exercises_reply eer
 			LEFT JOIN extracurricular_exercises ee ON ee.id_=eer.extracurricular_exercises_id_
-			LEFT JOIN sys_music_score sms ON sms.id_ = ee.music_score_id_
 			LEFT JOIN sys_user su ON su.id_ = eer.user_id_
 		WHERE
 			eer.id_ = #{extraExerciseReplyId}

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

@@ -28,6 +28,8 @@
 		<result column="role_type_" property="roleType" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
+		<result column="member_rank_setting_id_" property="memberRankSettingId" />
+		<result column="subject_name_" property="subjectName" />
 		<result column="username_" property="user.username" />
 		<result column="avatar_" property="user.avatar" />
 	</resultMap>
@@ -121,7 +123,8 @@
 	</select>
 	
 	<select id="queryByUserId" resultMap="ImGroup" parameterType="map">
-		SELECT ig.* FROM im_group_member igm left join im_group ig on igm.im_group_id_ = ig.id_
+		SELECT ig.* FROM im_group_member igm
+		LEFT JOIN im_group ig ON igm.im_group_id_ = ig.id_
 		where igm.user_id_ = #{userId}
 		<if test="search != null">
 			and (ig.name_ like concat('%',#{search},'%') or ig.tags_ like concat('%',#{search},'%'))
@@ -129,9 +132,13 @@
 	</select>
 	
 	<select id="queryMemberById" resultMap="ImGroupMemberDto">
-		SELECT igm.*,u.avatar_,case when find_in_set('STUDENT',u.user_type_) then u.username_ else u.real_name_ end username_
-		FROM im_group_member igm left join sys_user u on igm.user_id_ = u.id_
-		where igm.im_group_id_ = #{imGroupId}
+		SELECT igm.*,u.avatar_,CASE WHEN find_in_set('STUDENT',u.user_type_) THEN u.username_ ELSE u.real_name_ END username_,
+		st.member_rank_setting_id_,s.name_ subject_name_
+		FROM im_group_member igm
+		LEFT JOIN sys_user u ON igm.user_id_ = u.id_
+		LEFT JOIN student st ON st.user_id_ = u.id_
+		LEFT JOIN `subject` s ON s.id_ = st.subject_id_list_
+		WHERE igm.im_group_id_ = #{imGroupId}
 	</select>
 	
 	<select id="queryMember" resultMap="ImGroupMemberDto" parameterType="map">

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

@@ -13,6 +13,8 @@
 		<result column="friend_nickname_" property="friendNickname" />
 		<result column="memo_" property="memo" />
 		<result column="tags_" property="tags" />
+		<result column="member_rank_setting_id_" property="memberRankSettingId" />
+		<result column="subject_name_" property="subjectName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -90,9 +92,11 @@
 	</select>
 	
 	<select id="queryFriendListByUserId" resultMap="ImUserFriendDto" parameterType="map">
-		SELECT iuf.*,u.real_name_,u.avatar_,u.phone_,u.user_type_
+		SELECT iuf.*,u.real_name_,u.avatar_,u.phone_,u.user_type_,st.member_rank_setting_id_,s.name_ subject_name_
 		FROM im_user_friend iuf
 		LEFT JOIN sys_user u ON iuf.friend_id_ = u.id_
+		LEFT JOIN student st ON st.user_id_ = u.id_
+		LEFT JOIN `subject` s ON s.id_ = st.subject_id_list_
 		WHERE iuf.user_id_ = #{userId}
 		<if test="search != null">
 			and (u.real_name_ like concat('%',#{search},'%') or iuf.friend_nickname_ like concat('%',#{search},'%'))

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

@@ -40,7 +40,6 @@
         <result column="expect_num_" property="expectNum"/>
         <result column="attachments_" property="attachments"/>
         <result column="score_" property="score"/>
-        <result column="music_score_name_" property="musicScoreName"/>
         <result column="music_score_id_" property="musicScoreId"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -225,7 +224,6 @@
                ch.expect_num_,
                ch.expiry_date_,
                sch.music_score_id_,
-               sms.name_ music_score_name_,
                sch.id_  studentCourseHomeworkId,
                sch.attachments_,
                sch.score_,
@@ -236,7 +234,6 @@
                  LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
                  LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_
                  LEFT JOIN class_group cg ON ch.class_group_id_ = cg.id_
-                 LEFT JOIN sys_music_score sms ON sch.music_score_id_ = sms.id_
         WHERE ch.course_schedule_id_ = #{courseScheduleID}
           AND sch.user_id_ = #{userID}
     </select>
@@ -259,6 +256,12 @@
                0                   is_replied_timely_
         FROM course_schedule_student_payment sa
         WHERE sa.course_schedule_id_ = #{courseScheduleID}
+        <if test="userIdList != null and userIdList.size > 0">
+            AND sa.user_id_ IN
+            <foreach collection="userIdList" open="(" close=")" separator="," item="userId">
+                #{userId}
+            </foreach>
+        </if>
     </select>
     <select id="findByCourseSchedule" resultMap="StudentCourseHomework">
         SELECT

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

@@ -101,6 +101,9 @@
 		SELECT COUNT(0) FROM sys_music_score ses
 		<include refid="queryPageSql"/>
 	</select>
+    <select id="findByIds" resultMap="SysMusicScore">
+		SELECT * FROM sys_music_score WHERE FIND_IN_SET(id_,#{musicScoreIds})
+	</select>
     <sql id="queryPageSql">
 		<where>
 			ses.del_flag_ = 0

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ClassGroupController.java

@@ -1,21 +1,8 @@
 package com.ym.mec.teacher.controller;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.Objects;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.CourseScheduleStudentPaymentDao;
 import com.ym.mec.biz.dal.entity.CourseScheduleEvaluate;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
@@ -24,6 +11,14 @@ import com.ym.mec.biz.service.CourseScheduleEvaluateService;
 import com.ym.mec.biz.service.ImGroupNoticeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
 
 /**
  * @Author Joburgess
@@ -42,6 +37,8 @@ public class ClassGroupController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private ImGroupNoticeService imGroupNoticeService;
+    @Autowired
+    private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
 
     @ApiOperation(value = "教师关联班级获取")
     @GetMapping("/findTeacherClassGroups")
@@ -61,6 +58,12 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.findTeacherClassStudents(queryInfo));
     }
 
+    @ApiOperation(value = "获取课程学员列表")
+    @GetMapping("/getCourseStudents")
+    public HttpResponseResult getCourseStudents(Long courseScheduleId){
+        return succeed(courseScheduleStudentPaymentDao.getCourseStudents(courseScheduleId));
+    }
+
     @ApiOperation(value = "提交陪练报告")
     @PostMapping(value = "/addStudyReport")
     public HttpResponseResult addStudyReport(@RequestBody CourseScheduleEvaluate courseScheduleEvaluate) {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseReviewController.java

@@ -109,9 +109,9 @@ public class CourseReviewController extends BaseController {
     @PostMapping(value = "/addHomeWork")
     @ApiImplicitParams({ @ApiImplicitParam(name = "courseId", value = "课程编号", required = true, dataType = "int"),
             @ApiImplicitParam(name = "content", value = "作业内容", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "musicScoreId", value = "伴奏编号", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "musicScoreId", value = "伴奏编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "expiryDate", value = "作业截止日期", required = true, dataType = "Date")})
-    public HttpResponseResult addHomeWork(Integer courseId, String content, Date expiryDate,Integer musicScoreId) {
+    public HttpResponseResult addHomeWork(Integer courseId, String content, Date expiryDate,String musicScoreId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(sysUser)) {
             return failed(HttpStatus.FORBIDDEN, "请登录");

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -3,6 +3,7 @@ package com.ym.mec.teacher.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleStudentPaymentDao;
 import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;