Merge branch 'zx_saas_homework' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -54,5 +54,8 @@ public class StudentLessonExaminationDetailDto {
     @ApiModelProperty(value = "分谱")
     private Integer partIndex;
 
+    @ApiModelProperty(value = "曲目是否有效")
+    private Boolean validFlag;
+
 }
 

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

@@ -24,6 +24,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.function.Function;
@@ -206,7 +207,9 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
                     if(!StringUtils.equals(studentLessonTrainingDetail.getHomeworkType(),"VIDEO")){
                         SysMusicScore sysMusicScore = musicScoreMap.get(studentLessonTrainingDetail.getMusicScoreId().intValue());
                         if (sysMusicScore != null) {
-                            studentLessonTrainingDetail.setValidFlag(true);
+                            if(sysMusicScore.getShowFlag() == 1 && sysMusicScore.getDelFlag() == 0){
+                                studentLessonTrainingDetail.setValidFlag(true);
+                            }
                             studentLessonTrainingDetail.setMusicScoreName(sysMusicScore.getName());
                         }
                     }
@@ -236,7 +239,9 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
                     if(StringUtils.equals(studentLessonTrainingDetail.getHomeworkType(),"VIDEO")){
                         CbsMaterialWrapper.MaterialDto materialDto = materialDtoMap.get(studentLessonTrainingDetail.getMusicScoreId());
                         if (materialDto != null) {
-                            studentLessonTrainingDetail.setValidFlag(true);
+                            if(!materialDto.getDelFlag() && materialDto.getEnableFlag()){
+                                studentLessonTrainingDetail.setValidFlag(true);
+                            }
                             studentLessonTrainingDetail.setMusicScoreName(materialDto.getName());
                             studentLessonTrainingDetail.setContent(materialDto.getContent());
                         }

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

@@ -219,6 +219,7 @@
 			GROUP_CONCAT(sub.name_) subjectName,
 		    stu.member_rank_setting_id_ memberRankSettingId,
             sub.id_ subjectIdList,
+            sub.id_ subjectId,
 			sees.music_group_id_ musicGroupId
 		FROM
 			student_extracurricular_exercises_situation_ sees

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

@@ -33,7 +33,8 @@
     <select id="queryAll" resultType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto">
         select sms.name_ musicScoreName,sled.id_ studentLessonExaminationDetailId, sled.user_id_ userId, sled.lesson_examination_id_ lessonExaminationId, sled.music_score_id_ musicScoreId,
                sled.heard_level_ heardLevel, sled.training_score_ trainingScore,sled.avg_score_ avgScore, sled.actual_avg_score_ actualAvgScore, sled.start_ start, sled.end_ end,
-               sled.standard_score_ standardScore, sled.part_index_ partIndex,CASE WHEN sled.training_time_ IS NULL THEN 0 ELSE 1 END trainingFlag
+               sled.standard_score_ standardScore, sled.part_index_ partIndex,CASE WHEN sled.training_time_ IS NULL THEN 0 ELSE 1 END trainingFlag,
+               sms.del_flag_ = 0 AND sms.show_flag_ = 1 validFlag
         from student_lesson_examination_detail sled
         left join sys_music_score sms ON sms.id_ = sled.music_score_id_
         <where>