1、课程调整时排除自动补签记录

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

@@ -447,6 +447,9 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
                 return;
             }
             for (Integer teacherId : teachingTeacherIdList) {
+                if(Objects.isNull(teacherId)){
+                    return;
+                }
                 Teacher teacher = teacherMap.get(teacherId);
                 if(teacher.getEntryDate().after(entryDate)||teacher.getEntryDate().getTime()==entryDate.getTime()){
                     settlementType = SalarySettlementTypeEnum.GRADIENT_SALARY.getCode();

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

@@ -469,9 +469,9 @@
 
     <select id="countCourseSchedulesWithDate" resultType="int">
         SELECT
-        count(*)
+          count(*)
         FROM
-        music_group mg
+          music_group mg
         LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
         LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
         WHERE
@@ -1884,7 +1884,7 @@
                 )
             </if>
             <if test="groups != null and organIdList!=null">
-                AND cs.music_group_id_ IN
+                AND (cs.music_group_id_ IN
                 <foreach collection="groups" item="group" open="(" close=")" separator=",">
                     #{group.id}
                 </foreach>