Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

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

@@ -64,6 +64,16 @@ public class CourseHomeworkStudentDetailDto {
 
     private String type;
 
+    private Integer hasMember;
+
+    public Integer getHasMember() {
+        return hasMember;
+    }
+
+    public void setHasMember(Integer hasMember) {
+        this.hasMember = hasMember;
+    }
+
     @ApiModelProperty(value = "提交云教练的作业开关",required = false)
     private Integer homeworkOpenFlag;
 

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

@@ -108,16 +108,14 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			configValue = "0";
 		}
 		detail.setHomeworkOpenFlag(Integer.parseInt(configValue));
-		detail.setMusicScoreId(extraExerciseReply.getMusicScoreId());
-		detail.setMusicScoreName(extraExerciseReply.getMusicScoreName());
-//		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);
-//		}
+		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);
+		}
 		return detail;
 	}
 

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

@@ -215,14 +215,14 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             configValue = "0";
         }
         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);
-//        }
+        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);
+        }
         return courseHomeworkStudentDetail;
     }