系统收费作业开关

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

@@ -220,17 +220,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
         int normalRemindNum = studentAttendanceDao.countNormalRemindNum(courseID);
         currentCourseDetail.setNormalRemind(normalRemindNum<=0?0:1);
-
-		CourseSchedule courseSchedule = courseScheduleDao.get(courseID);
-		MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
-		if(musicGroup != null){
-			currentCourseDetail.setCourseViewType(musicGroup.getCourseViewType());
-		}
 		currentCourseDetail.setCurrentTime(new Date());
         currentCourseDetail.setAdvanceSignInMinutes(Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES)));
 		currentCourseDetail.setAttendanceRange(CourseScheduleType.VIP.equals(currentCourseDetail.getCourseType())?Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ATTENDANCE_RANGE_VIP)):Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ATTENDANCE_RANGE)));
         currentCourseDetail.setAdvanceSignOutMinutes(Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_OUT_MINUTES)));
-		List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseID);
 		//获取有会员的学员数
 		String configValue = sysConfigDao.findConfigValue(SysConfigService.HOMEWORK_OPEN_FLAG);
 		if(StringUtils.isEmpty(configValue)){
@@ -239,6 +232,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		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

@@ -112,11 +112,11 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		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);
 		}
-		detail.setMusicScoreId(extraExerciseReply.getMusicScoreId());
-		detail.setMusicScoreName(extraExerciseReply.getMusicScoreName());
 		return detail;
 	}
 

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

@@ -215,6 +215,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             configValue = "0";
         }
         if(configValue.equals("0")){
+            courseHomeworkStudentDetail.setMusicScoreId(null);
+            courseHomeworkStudentDetail.setMusicScoreName(null);
             courseHomeworkStudentDetail.setHasMember(0);
         }else {
             Student student = studentDao.get(userId.intValue());