Browse Source

学生端作业改版,曲目权限控制

zouxuan 3 years ago
parent
commit
6eb87493d4

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -66,6 +67,16 @@ public class CourseHomeworkStudentDetailDto {
 
     private Integer hasMember;
 
+    private SysMusicScore sysMusicScore;
+
+    public SysMusicScore getSysMusicScore() {
+        return sysMusicScore;
+    }
+
+    public void setSysMusicScore(SysMusicScore sysMusicScore) {
+        this.sysMusicScore = sysMusicScore;
+    }
+
     public Integer getHasMember() {
         return hasMember;
     }

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

@@ -55,6 +55,8 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	@Autowired
 	private CourseScheduleDao courseScheduleDao;
 	@Autowired
+	private SysMusicScoreDao sysMusicScoreDao;
+	@Autowired
 	private StudentServeService studentServeService;
 
 	@Override
@@ -103,6 +105,10 @@ 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";

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

@@ -74,6 +74,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     private ExtracurricularExercisesReplyDao extracurricularExercisesReplyDao;
     @Autowired
     private SysConfigDao sysConfigDao;
+    @Autowired
+    private SysMusicScoreDao sysMusicScoreDao;
 
     @Override
     public BaseDAO<Long, StudentCourseHomework> getDAO() {
@@ -208,6 +210,9 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
                 courseHomeworkStudentDetail.setTeacherId(courseSchedule.getActualTeacherId());
                 courseHomeworkStudentDetail.setTeacherName(teacher.getRealName());
             }
+            if(courseHomeworkStudentDetail.getMusicScoreId() != null){
+                courseHomeworkStudentDetail.setSysMusicScore(sysMusicScoreDao.get(courseHomeworkStudentDetail.getMusicScoreId()));
+            }
         }
         courseHomeworkStudentDetail.setType("HOMEWORK");
         String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);