Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -863,12 +863,15 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     public List<StudentCourseHomework> findExtraExerciseStudentsV2(StudentLessonTrainingDetailWrapper.StudentLessonTrainingQuery query) {
         List<StudentCourseHomework> extraExerciseStudents = extracurricularExercisesReplyService.findExtraExerciseStudents(
             query.getCourseScheduleId().longValue(), null);
+
+        List<StudentCourseHomework> studentCourseHomeworks = getStudentCourseHomeworks(extraExerciseStudents);
         if (query.getSubjectId() != null) {
-            extraExerciseStudents = extraExerciseStudents.stream()
+            studentCourseHomeworks = studentCourseHomeworks.stream()
+                                                         .filter(o ->o.getSubjectId() != null)
                                                          .filter(o -> o.getSubjectId().equals(query.getSubjectId()))
                                                          .collect(Collectors.toList());
         }
-        return getStudentCourseHomeworks(extraExerciseStudents);
+        return studentCourseHomeworks;
     }
 
     /**

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

@@ -776,6 +776,10 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
+        if (StringUtils.isNotBlank(queryInfo.getMusicGroupId())) {
+            subjectIds.clear();
+            subjectIds.add(queryInfo.getMusicGroupId());
+        }
         params.put("subjectIds", subjectIds);
         params.put("versionTag","v2");
 

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

@@ -78,7 +78,7 @@
                     and ee.music_group_id_ is null
                 </if>
                 <if test="studentAssignFlag == false">
-                    and ee.student_id_list_  is not null
+                    and ee.music_group_id_  is not null
                 </if>
             </if>
 		</where>
@@ -360,6 +360,9 @@
         <if test="versionTag != null">
             and version_tag_ = #{versionTag}
         </if>
+        <if test="musicGroupId != null">
+            and music_group_id_ = #{musicGroupId}
+        </if>
 	</sql>
 	<select id="countTeacherExtraHomeworkDetailV2" resultType="int">
         select count(1) from (

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

@@ -253,7 +253,7 @@
                     and eer.standard_flag_ in ('STANDARD','EXCELLENT')
                 </if>
                 <if test="finishStatus == false">
-                    and eer.standard_flag_  not in ('STANDARD','EXCELLENT')
+                    and (eer.standard_flag_  not in ('STANDARD','EXCELLENT') or eer.standard_flag_ is null)
                 </if>
             </if>
             <if test="versionTag != null">

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

@@ -400,7 +400,7 @@
                 and sch.standard_flag_ in ('STANDARD','EXCELLENT')
             </if>
             <if test="finishStatus == false">
-                and sch.standard_flag_  not in ('STANDARD','EXCELLENT')
+                and (sch.standard_flag_  not in ('STANDARD','EXCELLENT') or sch.standard_flag_ is null)
             </if>
         </if>
         <if test="versionTag != null">
@@ -421,7 +421,7 @@
                 and sch.standard_flag_ in ('STANDARD','EXCELLENT')
             </if>
             <if test="finishStatus == false">
-                and sch.standard_flag_  not in ('STANDARD','EXCELLENT')
+                and (sch.standard_flag_  not in ('STANDARD','EXCELLENT') or sch.standard_flag_ is null)
             </if>
         </if>
         <if test="versionTag != null">
@@ -730,7 +730,7 @@
         left join course_homework ch on ch.id_ = sch.course_homework_id_
         WHERE
             sch.user_id_ = #{userId}
-                AND sch.standard_flag_ not in ('STANDARD','EXCELLENT')
+                AND (sch.standard_flag_ not in ('STANDARD','EXCELLENT') or sch.standard_flag_ is null)
         and ch.expiry_date_ &gt;= #{now}
     </select>