Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into test

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -321,7 +321,7 @@
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND cssp.user_id_ = sa.user_id_
 		LEFT JOIN teacher_attendance ta on ta.course_schedule_id_ = cs.id_
 		LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
-		where cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND csts.user_id_ = #{userId} AND cs.status_ = 'OVER' AND cs.class_date_ BETWEEN #{startTime} AND DATE(NOW())
+		where cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND csts.user_id_ = #{userId} AND cs.status_ = 'OVER' AND cs.class_date_ BETWEEN #{startTime} AND DATE(NOW())
 		AND (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0))
 		AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cssp.id_ IS NOT NULL

mec-application/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -2287,9 +2287,9 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             String[] header = {"老师编号", "老师名称", "所属分部", "老师状态", "专业技能", "联系电话", "工作类型",
-                    "员工状态", "已开小课", "试听课安排", "开放网管课", "转正日期", "离职日期"};
+                    "已开小课", "试听课安排", "开放网管课", "转正日期", "离职日期"};
             String[] body = {"id", "realName", "organName", "lockFlag == 0?'正常':lockFlag == 1?'冻结':'锁定'", "splitSubjectName", "phone", "jobNature.msg",
-                    "isProbationPeriod.msg", "vipNum", "demoNum", "isSupportExtraPracticeLesson?'是':'否'", "formalStaffDate", "demissionDate"};
+                    "vipNum", "demoNum", "isSupportExtraPracticeLesson?'是':'否'", "formalStaffDate", "demissionDate"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherPage-" + DateUtil.getDate(new Date()) + ".xls");

mec-application/src/main/resources/bootstrap-prod.properties

@@ -1,6 +1,6 @@
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
+spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -243,7 +243,7 @@
         from employee e
         left join sys_user su on su.id_ = e.user_id_
         <where>
-            su.del_flag_ = 0
+            su.del_flag_ = '0'
             <if test="createStartDate != null and createStartDate != ''">
                 and #{createStartDate} &lt;= e.update_time_
             </if>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -325,10 +325,10 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     /**
      * 根据老师编号列表获取小课数量
      *
-     * @param teacherIds
+     * @param teachers
      * @return
      */
-    List<Map<Integer, Integer>> countTeacherVipNum(String teacherIds);
+    List<Map<Integer, Integer>> countTeacherVipNum(@Param("teachers") Set<Integer> teachers);
 
     /**
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassGroupDto>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/DemoGroupDao.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface DemoGroupDao extends BaseDAO<Long, DemoGroup> {
 
@@ -111,10 +112,10 @@ public interface DemoGroupDao extends BaseDAO<Long, DemoGroup> {
 
     /**
      * 根据教师编号列表获取试听课数量map
-     * @param teacherIds
+     * @param teachers
      * @return
      */
-    List<Map<Integer, Integer>> countTeacherDemoGroupNum(String teacherIds);
+    List<Map<Integer, Integer>> countTeacherDemoGroupNum(@Param("teachers") Set<Integer> teachers);
 
     /**
      * 查询vip课程数

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

@@ -2096,8 +2096,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
     //url路径改造
     public static String urlTypeChange(String url){
-        if (url.isEmpty()){
+        if (StringUtils.isBlank(url)){
             log.warn("url为空");
+            return url;
         }
         String replace;
         if (url.contains("https://ks3-cn-beijing.ksyuncs.com")){

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

@@ -566,6 +566,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             List<Map<Integer, String>> studentGroupNamesMapList = studentRegistrationDao.queryStudentMusicGroupNamesMap(studentIds);
             Map<Integer, String> studentGroupNamesMap = MapUtil.convertIntegerMap(studentGroupNamesMapList);
             Set<Integer> hasVipCourseStudentIds = courseScheduleStudentPaymentDao.getHasVipCourseStudentIds(studentIds);
+            Map<Integer, String> subjectMap = subjectService.getMap("subject", "id", "name", false, 1, Integer.class, String.class);
 
             for (EduOrganStudentListDto eduOrganStudentListDto : dataList) {
                 if(studentGroupNamesMap.containsKey(eduOrganStudentListDto.getStudentId())){
@@ -579,6 +580,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                 }
                 eduOrganStudentListDto.setCloudStudyUseTime(eduOrganStudentListDto.getCloudStudyUseTime()/60);
                 eduOrganStudentListDto.setCloudStudyUseAvgTime(eduOrganStudentListDto.getCloudStudyUseAvgTime()/60);
+                eduOrganStudentListDto.setSubjectName(subjectMap.get(eduOrganStudentListDto.getStudentId()));
             }
         }
         pageInfo.setRows(dataList);
@@ -660,12 +662,14 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if(!CollectionUtils.isEmpty(studentNotStartPracticeCourseNumMapList)){
                 studentNotStartPracticeCourseNumMap = MapUtil.convertIntegerMap(studentNotStartPracticeCourseNumMapList);
             }
+            Map<Integer, String> subjectMap = subjectService.getMap("subject", "id", "name", false, 1, Integer.class, String.class);
             //获取分部年级列表
             Map<Integer, String> gradeList = organizationService.getGradeList(1);
             for (EduOrganStudentListDto eduOrganStudentListDto : dataList1) {
                 EduOrganStudentListExportDto data = new EduOrganStudentListExportDto();
                 BeanUtils.copyProperties(eduOrganStudentListDto, data);
                 data.setOrganName(organMap.get(data.getOrganId()));
+                data.setSubjectName(subjectMap.get(data.getStudentId()));
                 if (StringUtils.isNotEmpty(eduOrganStudentListDto.getCurrentGradeNum())) {
                     data.setCurrentGradeNum(eduOrganStudentListDto.getCurrentGradeNum());
                     String grade = gradeList.get(Integer.parseInt(eduOrganStudentListDto.getCurrentGradeNum()));

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

@@ -646,27 +646,22 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
         PageInfo<Teacher> pageInfo = queryPage(queryInfo);
         List<Teacher> rows = pageInfo.getRows();
         if (rows != null && rows.size() > 0) {
-            if(rows.size() < 30){
-                Set<Integer> teachers = rows.stream().map(e -> e.getId()).collect(Collectors.toSet());
-                String teacherIds = StringUtils.join(teachers, ",");
-                //获取小课数量
-                Map<Integer, Integer> vipNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherVipNum(teacherIds))), HashMap.class);
-                //获取试听课数量
-                Map<Integer, Integer> demoNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(demoGroupDao.countTeacherDemoGroupNum(teacherIds))), HashMap.class);
-
-                Set<Integer> organIds = rows.stream().map(e -> e.getTeacherOrganId()).collect(Collectors.toSet());
-                Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
-                for (Teacher e : rows) {
-                    e.setSubjectName(subjectDao.findBySubIds(e.getSubjectId()));
-                    e.setOrganName(organNames.get(e.getTeacherOrganId()));
-                    if (StringUtils.isNotEmpty(e.getSplitSubjectName())) {
-                        e.setSubjectName(Arrays.asList(e.getSplitSubjectName().split(",")));
-                    }
-                    Integer num = vipNumMap.get(e.getId());
-                    e.setVipNum(num == null ? 0 : num);
-                    Integer demoNum = demoNumMap.get(e.getId());
-                    e.setDemoNum(demoNum == null ? 0 : demoNum);
+            Set<Integer> teachers = rows.stream().map(e -> e.getId()).collect(Collectors.toSet());
+            //获取小课数量
+            Map<Integer, Integer> vipNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherVipNum(teachers))), HashMap.class);
+            //获取试听课数量
+            Map<Integer, Integer> demoNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(demoGroupDao.countTeacherDemoGroupNum(teachers))), HashMap.class);
+
+            Map<Integer, String> organNames = getMap("organization", "id_", "name_", false, 1, Integer.class, String.class);
+            for (Teacher e : rows) {
+                e.setOrganName(organNames.get(e.getTeacherOrganId()));
+                if (StringUtils.isNotEmpty(e.getSplitSubjectName())) {
+                    e.setSubjectName(Arrays.asList(e.getSplitSubjectName().split(",")));
                 }
+                Integer num = vipNumMap.get(e.getId());
+                e.setVipNum(num == null ? 0 : num);
+                Integer demoNum = demoNumMap.get(e.getId());
+                e.setDemoNum(demoNum == null ? 0 : demoNum);
             }
         }
         return pageInfo;

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

@@ -296,7 +296,7 @@
         LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
-        LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_ AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.pre_course_flag_ = 0
+        LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_ AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.pre_course_flag_ != 1
         <include refid="queryGroupCoursesSql"/>
         GROUP BY cgtm.id_
         <include refid="global.limit"/>
@@ -652,7 +652,11 @@
     </select>
     <select id="countTeacherVipNum" resultType="java.util.Map">
         SELECT vg.user_id_ `key`,COUNT(vg.id_) `value` FROM vip_group vg
-        WHERE FIND_IN_SET(vg.user_id_,#{teacherIds}) GROUP BY user_id_
+        WHERE vg.user_id_ IN
+        <foreach collection="teachers" item="teacherId" open="(" separator="," close=")">
+            #{teacherId}
+        </foreach>
+        GROUP BY user_id_
     </select>
 
     <resultMap id="TeacherClassGroupDto" type="com.ym.mec.biz.dal.dto.TeacherClassGroupDto">
@@ -703,10 +707,10 @@
             LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
             LEFT JOIN school s ON mg.school_id_ = s.id_
         WHERE
-            csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+            csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
             AND cg.group_type_='MUSIC'
             AND cg.del_flag_ = 0
-            AND cs.del_flag_ = 0
+            AND cs.del_flag_ = '0'
             AND mg.status_ = 'PROGRESS'
             <if test="groupName!=null and groupName!=''">
                 AND mg.name_ LIKE CONCAT('%', #{groupName}, '%')
@@ -853,7 +857,7 @@
 
     <sql id="queryMusicGroupCourseScheduleSql">
         <where>
-            cs.group_type_ = 'MUSIC' AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+            cs.group_type_ = 'MUSIC' AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
             <if test="startTime != null">
                 AND cs.class_date_ &gt;= #{startTime}
             </if>
@@ -871,7 +875,7 @@
 
     <sql id="queryMusicGroupCourseScheduleDetailSql">
         <where>
-            (ta.teacher_id_ = cs.actual_teacher_id_ OR ta.id_ IS NULL) AND cs.group_type_ = 'MUSIC' AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+            (ta.teacher_id_ = cs.actual_teacher_id_ OR ta.id_ IS NULL) AND cs.group_type_ = 'MUSIC' AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
             <if test="classScheduleType != null">
                 AND cs.type_ = #{classScheduleType}
             </if>
@@ -1641,7 +1645,7 @@
         <foreach collection="classIdList" separator="," open="(" close=")" item="id">
             #{id}
         </foreach>
-        AND cs.convert_flag_ = 1 AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0
+        AND cs.convert_flag_ = 1 AND cs.status_ = 'NOT_START' AND cs.del_flag_ = '0' AND cs.is_lock_ = 0
     </select>
 
     <select id="queryByIds" resultType="com.ym.mec.biz.dal.entity.ClassGroup">

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

@@ -320,7 +320,7 @@
         FROM
             class_group_student_mapper cgsm
             LEFT JOIN course_schedule cs ON cgsm.class_group_id_=cs.class_group_id_
-            WHERE cgsm.user_id_=#{userId} AND cs.del_flag_ = 0
+            WHERE cgsm.user_id_=#{userId} AND cs.del_flag_ = '0'
             AND cs.class_date_ = DATE_FORMAT(#{data},'%Y-%m-%d')
             AND cgsm.status_=#{status}
     </select>
@@ -458,7 +458,7 @@
     <select id="queryNewStudentListByCourseScheduleId" resultMap="ClassGroupStudentMapper">
       	SELECT cgsm.* FROM class_group_student_mapper cgsm LEFT JOIN course_schedule cs ON cgsm.class_group_id_= cs.class_group_id_
 		LEFT JOIN course_schedule_student_payment cssp on cssp.course_schedule_id_ = cs.id_ and cssp.user_id_ = cgsm.user_id_
-		WHERE cssp.id_ IS NULL AND cgsm.status_ != 'QUIT' and cs.id_ = #{courseScheduleId} AND cs.del_flag_ = 0
+		WHERE cssp.id_ IS NULL AND cgsm.status_ != 'QUIT' and cs.id_ = #{courseScheduleId} AND cs.del_flag_ = '0'
     </select>
     <select id="findByGroups" resultMap="ClassGroupStudentMapper">
       SELECT
@@ -646,7 +646,7 @@
         WHERE
         cg.type_ IN ('HIGH', 'HIGH_ONLINE')
         AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
-        AND cs.del_flag_=0
+        AND cs.del_flag_ = '0'
         AND cs.status_='NOT_START'
         AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
         <if test="hasDesc != null and hasDesc == true">

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

@@ -85,7 +85,7 @@
         SELECT COUNT(DISTINCT cto.student_id_)
         FROM cloud_teacher_order cto
             LEFT JOIN sys_user su ON cto.student_id_=su.id_
-        WHERE su.del_flag_=0 AND cto.status_ IN (1,2) AND su.organ_id_=#{organId}
+        WHERE su.del_flag_='0' AND cto.status_ IN (1,2) AND su.organ_id_=#{organId}
     </select>
 
     <select id="getOrgansTotalVipStudentNum" resultType="int">
@@ -95,7 +95,7 @@
 		union
 		SELECT cto.`student_id_`  FROM `cloud_teacher_order` cto WHERE cto.`status_` = 1
 		) a LEFT JOIN sys_user su ON a.user_id_=su.id_
-        WHERE su.del_flag_=0 
+        WHERE su.del_flag_='0'
         <if test="organIds!=null and organIds.size()>0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -110,7 +110,7 @@
             COUNT(DISTINCT cto.student_id_) 'value'
         FROM cloud_teacher_order cto
                  LEFT JOIN sys_user su ON cto.student_id_=su.id_
-        WHERE su.del_flag_=0 AND cto.status_ IN (1,2)
+        WHERE su.del_flag_='0' AND cto.status_ IN (1,2)
         <if test="organIds!=null and organIds.size()>0">
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">

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

@@ -126,7 +126,7 @@
     <select id="findByPlatformOrderId" resultMap="CloudTeacherOrder">
         select * from cloud_teacher_order cto
         left join sys_user su on cto.student_id_ = su.id_
-        where cto.platform_order_id_ = #{platformOrderId} and su.del_flag_ = 0
+        where cto.platform_order_id_ = #{platformOrderId} and su.del_flag_ = '0'
     </select>
 
     <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="mapper">
@@ -136,7 +136,7 @@
     <select id="findUserNameByOrderId" resultMap="mapper">
         select su.id_ as userId, su.phone_ as phone from cloud_teacher_order cto
         left join sys_user su on cto.student_id_ = su.id_
-        where platform_order_id_ = #{platformOrderId} and su.del_flag_ = 0
+        where platform_order_id_ = #{platformOrderId} and su.del_flag_ = '0'
     </select>
 
     <update id="updateOrderStatusOK">

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

@@ -270,7 +270,7 @@
 	<select id="queryTeacerNoReplyNum" resultMap="Mapper">
 		select cs.actual_teacher_id_ key_,count(1) value_ from student_course_homework sch
 		left join course_schedule cs on sch.course_schedule_id_ = cs.id_
-		where cs.del_flag_ = 0 AND cs.actual_teacher_id_ IS NOT NULL
+		where cs.del_flag_ = '0' AND cs.actual_teacher_id_ IS NOT NULL
 		AND sch.is_replied_ = 0 group by cs.actual_teacher_id_
 	</select>
 

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

@@ -117,7 +117,7 @@
 		FROM
 			course_schedule cs
 		LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-		WHERE cs.id_=#{courseScheduleID}  AND cs.del_flag_ = 0
+		WHERE cs.id_=#{courseScheduleID}  AND cs.del_flag_ = '0'
 	</select>
 
 </mapper>

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

@@ -9,7 +9,7 @@
     <select id="countLegalCourse" resultType="java.lang.Integer">
         SELECT COUNT(cs.id_) FROM course_schedule cs
         WHERE status_ = 'NOT_START' AND (cs.type_ IN ('SINGLE','TRAINING_SINGLE') OR cs.convert_flag_ = 1)
-        AND cs.is_lock_ = 0 AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.new_course_id_ IS NULL
+        AND cs.is_lock_ = 0 AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND cs.new_course_id_ IS NULL
         AND cs.id_ IN
         <foreach collection="courseIdList" item="id" open="(" close=")" separator=",">
             #{id}

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

@@ -174,7 +174,7 @@
                  LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         WHERE cs.group_type_ = 'PRACTICE'
           AND cs.status_ != 'NOT_START'
-          AND cs.del_flag_ = 0
+          AND cs.del_flag_ = '0'
           AND pg.type_='FREE'
           AND pg.group_status_ != 'LOCK'
           and cs.tenant_id_ = #{tenantId}
@@ -361,7 +361,7 @@
                  LEFT JOIN student s ON s.user_id_ = cssp.user_id_
         WHERE cs.id_ >= 1
           AND vg.id_ >= 1
-          AND (cs.is_lock_ IS NULL OR cs.is_lock_ = 0)
+          AND cs.is_lock_ = 0
           AND s.operating_tag_ = 0
           and cssp.tenant_id_ = #{tenantId}
         GROUP BY vg.organ_id_
@@ -377,7 +377,7 @@
         WHERE pg.group_status_ IN ('NORMAL', 'FINISH')
           AND pg.buy_months_ >= 1
           AND cs.id_ >= 1
-          AND (cs.is_lock_ IS NULL OR cs.is_lock_ = 0)
+          AND cs.is_lock_ = 0
           AND s.operating_tag_ = 0
           and pg.tenant_id_ = #{tenantId}
         GROUP BY pg.organ_id_
@@ -393,8 +393,8 @@
             <![CDATA[AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) < #{endDate}]]>
         </if>
         AND cs.teach_mode_ = 'ONLINE'
-        AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
-        AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+        AND cs.is_lock_ = 0
+        AND cs.del_flag_ = '0'
           and cssp.tenant_id_ = #{tenantId}
         GROUP BY su.organ_id_
     </select>
@@ -407,8 +407,8 @@
         WHERE pg.id_ >= 1
         AND pg.group_status_ IN ('NORMAL', 'FINISH')
         AND cs.id_ >=1
-        AND (cs.is_lock_ IS NULL OR cs.is_lock_=0)
-        AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+        AND cs.is_lock_ = 0
+        AND cs.del_flag_ = '0'
         AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) >= #{classDate}
         <if test="endDate != null">
             <![CDATA[AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) < #{endDate}]]>
@@ -429,10 +429,10 @@
         WHERE pg.group_status_ IN ('NORMAL', 'FINISH')
         AND vcs.id_ >=1
         AND pcs.id_ >= 1
-        AND (vcs.is_lock_ IS NULL OR vcs.is_lock_=0)
-        AND (vcs.del_flag_ IS NULL OR vcs.del_flag_=0)
-        AND (pcs.is_lock_ IS NULL OR pcs.is_lock_=0)
-        AND (pcs.del_flag_ IS NULL OR pcs.del_flag_=0)
+        AND vcs.is_lock_=0
+        AND vcs.del_flag_ = '0'
+        AND pcs.is_lock_=0
+        AND pcs.del_flag_ = '0'
         AND CONCAT(vcs.class_date_, ' ', vcs.end_class_time_) >= #{classDate}
         AND CONCAT(pcs.class_date_, ' ', pcs.end_class_time_) >= #{classDate}
         <if test="endDate != null">

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

@@ -199,7 +199,7 @@
     </sql>
 
     <sql id="courseIgnore">
-        AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ = 0
+        AND cs.del_flag_ = '0' AND cs.is_lock_ = 0 and cs.pre_course_flag_ != 1
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
     </sql>
 
@@ -543,7 +543,7 @@
         WHERE cs.actual_teacher_id_ = #{teacherId}
           AND (CONCAT(cs.class_date_, ' ', cs.end_class_time_) BETWEEN #{startTime} AND #{endTime})
           AND cs.schoole_id_ = #{schoolId}
-          AND ta.sign_in_time_ IS NOT NULL AND cs.pre_course_flag_ = 0
+          AND ta.sign_in_time_ IS NOT NULL AND cs.pre_course_flag_ != 1
         ORDER BY cs.id_
     </select>
 
@@ -621,7 +621,7 @@
                 LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
             </if>
         WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="organIds!=null and organIds.size()>0">
                 AND cs.organ_id_ IN
                 <foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -662,7 +662,7 @@
             LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
         </if>
         WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
         AND cs.id_ IS NOT NULL
         <if test="organIds!=null and organIds.size()>0">
             AND cs.organ_id_ IN
@@ -722,7 +722,7 @@
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
         AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
         AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
-        AND cssp.user_id_ = #{studentId} AND cs.pre_course_flag_ = 0
+        AND cssp.user_id_ = #{studentId} AND cs.pre_course_flag_ != 1
         <if test="quitClassGroupIds != null and quitClassGroupIds.size()>0">
             AND cssp.class_group_id_ NOT IN
             <foreach collection="quitClassGroupIds" item="quitClassGroupId" open="(" close=")" separator=",">
@@ -773,7 +773,7 @@
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
         </if>
-        AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+        AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
         ORDER BY start_class_time_
     </select>
 
@@ -862,7 +862,7 @@
             AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
           AND cs.class_date_ = DATE_FORMAT(#{classDate}, '%Y%m%d')
           AND csts.user_id_ = #{teacherId}
-          AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) &lt; NOW() AND cs.pre_course_flag_ = 0
+          AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) &lt; NOW() AND cs.pre_course_flag_ != 1
         ORDER BY start_class_time_
     </select>
 
@@ -872,7 +872,7 @@
                  LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         WHERE DATE_FORMAT(cs.class_date_, '%Y%m') = DATE_FORMAT(#{month}, '%Y%m')
           AND cg.music_group_id_ = #{musicGroupID}
-          AND cg.group_type_ = 'MUSIC' AND cs.pre_course_flag_ = 0
+          AND cg.group_type_ = 'MUSIC' AND cs.pre_course_flag_ != 1
         GROUP BY cs.class_date_
     </select>
 
@@ -992,7 +992,7 @@
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
-        AND cssp.user_id_ = #{studentId} AND cs.pre_course_flag_ = 0
+        AND cssp.user_id_ = #{studentId} AND cs.pre_course_flag_ != 1
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>
@@ -1016,7 +1016,7 @@
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
         AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
-        AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+        AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>
@@ -1069,7 +1069,7 @@
         AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
         AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
         AND csts.user_id_ = #{teacherId}
-        AND cg.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+        AND cg.del_flag_ = 0 AND cs.pre_course_flag_ != 1
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>
@@ -1113,7 +1113,7 @@
                 LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
             </if>
         WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="organIds!=null and organIds.size()>0">
                 AND cs.organ_id_ IN
                 <foreach collection="organIds" item="organId" separator="," open="(" close=")">
@@ -1152,8 +1152,8 @@
         <where>
             cssp.user_id_=#{userId}
             AND cs.status_ != 'NOT_START'
-            AND cs.del_flag_ = 0
-            AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL) AND cs.pre_course_flag_ = 0
+            AND cs.del_flag_ = '0'
+            AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL) AND cs.pre_course_flag_ != 1
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
             <if test="teachMode!=null and teachMode!=''">
                 AND cs.teach_mode_=#{teachMode}
@@ -1236,7 +1236,7 @@
         AND cs.status_ = 'NOT_START'
         AND cssp.user_id_ = #{userId}
         AND cs.class_date_ = DATE_FORMAT(#{date}, '%Y%m%d')
-        AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
+        AND cs.pre_course_flag_ != 1 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
         ORDER BY cs.class_date_, cs.start_class_time_
     </select>
     <select id="findCourseScheduleByMusicGroup" resultMap="CourseSchedule">
@@ -1518,7 +1518,7 @@
         <where>
             (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
-            AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ = 0
+            AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
             <if test="userId != null">
                 AND csts.user_id_ = #{userId}
             </if>
@@ -1589,7 +1589,7 @@
 
     <sql id="teacherGroupCourseQueryCondition">
         <where>
-            cs.actual_teacher_id_=#{teacherId} AND cs.pre_course_flag_ = 0
+            cs.actual_teacher_id_=#{teacherId} AND cs.pre_course_flag_ != 1
             AND cs.music_group_id_ = #{groupId}
             AND cs.group_type_ = #{groupType}
         </where>
@@ -1656,7 +1656,7 @@
         LEFT JOIN sys_user ssu ON sa.user_id_=ssu.id_
         LEFT JOIN school s ON cs.schoole_id_ = s.id_
         WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
         AND sa.class_group_id_=#{classGroupId}
         <if test="userId != null">
             AND sa.teacher_id_=#{userId}
@@ -1690,7 +1690,7 @@
         student_attendance sa
         LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
         WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
         AND sa.class_group_id_=#{classGroupId}
         <if test="userId != null">
             AND sa.teacher_id_=#{userId}
@@ -1711,7 +1711,7 @@
         FROM class_group cg
                  LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
         WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-          AND cg.music_group_id_ = #{musicGroupId} AND cs.pre_course_flag_ = 0
+          AND cg.music_group_id_ = #{musicGroupId} AND cs.pre_course_flag_ != 1
         GROUP BY cg.id_
     </select>
     <select id="findCourseScheduleCurrentTimes" resultType="java.util.Map">
@@ -1763,7 +1763,7 @@
         LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND cs.teacher_id_=#{teacherId} AND cs.pre_course_flag_ = 0
+        AND cs.teacher_id_=#{teacherId} AND cs.pre_course_flag_ != 1
         and CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) between #{startTime} and #{endTime}
         <if test="type != null">
             and cs.type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
@@ -1897,7 +1897,7 @@
         </foreach>
         )
         and cs.tenant_id_ = #{tenantId}
-        AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+        AND cs.del_flag_ = '0'
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
     </select>
     <select id="findByClassDateAndStu" resultMap="CourseSchedule">
@@ -1921,7 +1921,7 @@
         </foreach>
         )
         and cs.tenant_id_ = #{tenantId} AND cssp.user_id_ = #{userId}
-        AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+        AND cs.del_flag_ = '0'
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
     </select>
 
@@ -1929,7 +1929,7 @@
         select cssp.user_id_ key_, count(1) value_
         from course_schedule cs
                  right join course_schedule_student_payment cssp on cs.id_ = cssp.course_schedule_id_
-        where class_date_ = date(DATE_ADD(now(), INTERVAL 1 DAY)) AND cs.pre_course_flag_ = 0
+        where class_date_ = date(DATE_ADD(now(), INTERVAL 1 DAY)) AND cs.pre_course_flag_ != 1
         group by cssp.user_id_
     </select>
 
@@ -1938,7 +1938,7 @@
         from course_schedule cs
                  right join course_schedule_student_payment cssp on cs.id_ = cssp.course_schedule_id_
         where CONCAT(cs.class_date_, ' ', cs.start_class_time_) &lt; DATE_ADD(now(), INTERVAL 90 MINUTE)
-          and cs.status_ = 'NOT_START' AND cs.pre_course_flag_ = 0
+          and cs.status_ = 'NOT_START' AND cs.pre_course_flag_ != 1
     </select>
 
     <select id="queryTeacherCoursesTimesOfTomorrow" resultMap="Mapper">
@@ -1946,7 +1946,7 @@
         from course_schedule cs
                  right join course_schedule_teacher_salary cssp on cs.id_ = cssp.course_schedule_id_
                  left join sys_user u on u.id_ = cssp.user_id_
-        where (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND class_date_ = date(DATE_ADD(now(), INTERVAL 1 DAY)) AND cs.pre_course_flag_ = 0
+        where (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND class_date_ = date(DATE_ADD(now(), INTERVAL 1 DAY)) AND cs.pre_course_flag_ != 1
         group by cssp.user_id_
     </select>
 
@@ -2012,7 +2012,7 @@
             AND cs.class_date_ BETWEEN #{startDate} AND #{endDate}
           AND cs.group_type_ = 'MUSIC'
           and cs.tenant_id_ = #{tenantId}
-          AND (cs.del_flag_ IS NULL OR cs.del_flag_ = 0) AND cs.pre_course_flag_ = 0
+          AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
 
     <select id="findByClassGroup" resultMap="CourseSchedule">
@@ -2065,7 +2065,7 @@
                cs.schoole_id_
         from course_schedule cs
                  LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
-        where cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ = 0
+        where cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
           AND cs.status_ = #{status}
     </select>
     <select id="findByClassGroups" resultMap="CourseSchedule">
@@ -2097,7 +2097,7 @@
         <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
             #{classGroupId}
         </foreach>
-        AND cs.pre_course_flag_ = 0
+        AND cs.pre_course_flag_ != 1
         ORDER BY start_class_time_
     </select>
     <select id="findStudentMap" resultType="java.util.Map">
@@ -2143,14 +2143,14 @@
                  LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         WHERE cg.music_group_id_ = #{musicGroupId}
           AND cs.group_type_ = #{groupType}
-          AND status_ = #{status} AND cs.pre_course_flag_ = 0
+          AND status_ = #{status} AND cs.pre_course_flag_ != 1
     </select>
     <select id="findMusicGroupAllCourseSchedules" resultMap="CourseSchedule">
         SELECT cs.*
         FROM course_schedule cs
                  LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         WHERE cg.music_group_id_ = #{musicGroupId}
-          AND cs.group_type_ = #{groupType} AND cs.pre_course_flag_ = 0
+          AND cs.group_type_ = #{groupType} AND cs.pre_course_flag_ != 1
     </select>
     <select id="findMusicGroupCourseSchedulesWithStudent" resultMap="CourseSchedule">
         SELECT cs.*
@@ -2160,7 +2160,7 @@
           AND cssp.music_group_id_ = #{musicGroupId}
           AND cssp.group_type_ = #{groupType}
           AND cs.status_ = #{status}
-          AND cssp.user_id_ = #{userId} AND cs.pre_course_flag_ = 0
+          AND cssp.user_id_ = #{userId} AND cs.pre_course_flag_ != 1
     </select>
 
     <delete id="deleteMusicGroupCourseSchedulesWithStudent">
@@ -2224,7 +2224,7 @@
         WHERE cs.music_group_id_ = #{musicGroupId}
           and cs.group_type_ = 'MUSIC'
           and cs.status_ != 'OVER'
-          AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+          AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         LIMIT 1
     </select>
     <select id="findClassGroupCourseSchedules" resultMap="CourseSchedule">
@@ -2252,7 +2252,7 @@
                cs.schoole_id_
         FROM course_schedule cs
         WHERE cs.class_group_id_ = #{classGroupId}
-          AND (cs.del_flag_ = 0 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+          AND (cs.del_flag_ = '0' OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
     </select>
     <select id="countVipGroupCourses" resultType="int">
         SELECT count(cs.id_)
@@ -2294,21 +2294,21 @@
         <foreach collection="vipGroupIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        AND cs.group_type_ = #{groupType} AND cs.del_flag_ = 0
+        AND cs.group_type_ = #{groupType} AND cs.del_flag_ = '0'
         GROUP BY cs.music_group_id_
     </select>
     <select id="countTotalCourseScheduleNumWithGroup" resultType="int">
         SELECT COUNT(cs.id_)
         FROM course_schedule cs
         WHERE cs.music_group_id_ = #{groupId}
-        AND cs.group_type_ = #{groupType} AND cs.del_flag_ = 0
+        AND cs.group_type_ = #{groupType} AND cs.del_flag_ = '0'
     </select>
     <select id="countCourseScheduleNum" resultType="java.util.Map">
         SELECT cs.music_group_id_ 'key',COUNT(cs.id_) 'value' FROM course_schedule cs WHERE cs.music_group_id_ IN
         <foreach collection="vipGroupIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        AND cs.group_type_ = #{groupType} AND cs.status_ != 'NOT_START' AND cs.del_flag_ = 0
+        AND cs.group_type_ = #{groupType} AND cs.status_ != 'NOT_START' AND cs.del_flag_ = '0'
         GROUP BY cs.music_group_id_
     </select>
     <select id="countTotalNumByClassGroupId" resultType="java.util.Map">
@@ -2323,7 +2323,7 @@
         <if test="preCourseFlag != null">
             AND cs.pre_course_flag_ = #{preCourseFlag}
         </if>
-        AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         GROUP BY cs.class_group_id_
     </select>
     <select id="countPreTotalNumByClassGroupId" resultType="java.util.Map">
@@ -2332,7 +2332,7 @@
         <foreach collection="classGroupIds" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
-        AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ = 1
         GROUP BY cs.class_group_id_
     </select>
     <select id="countTotalNumByClassGroupIds" resultType="java.util.Map">
@@ -2347,7 +2347,7 @@
         <if test="endClassDate != null">
             AND cs.class_date_ &lt;= DATE_FORMAT(#{endClassDate}, '%Y%m%d')
         </if>
-        AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND cs.is_lock_ = 0
         GROUP BY cs.class_group_id_
     </select>
     <select id="queryCourseTypeByClassGroupIds" resultType="java.lang.String">
@@ -2360,7 +2360,7 @@
         <if test="dto.endSchoolTerm != null">
             AND cs.class_date_ &lt;= DATE_FORMAT(#{dto.endSchoolTerm}, '%Y%m%d')
         </if>
-        AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND cs.is_lock_ = 0
         UNION ALL
         SELECT DISTINCT tp.course_type_ type_ FROM music_group_train_plan tp
         WHERE tp.class_group_id_ = #{dto.classGroupId}
@@ -2380,7 +2380,7 @@
         <if test="teacherId != null">
             AND cs.actual_teacher_id_ = #{teacherId}
         </if>
-        AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0
+        AND cs.status_ = 'NOT_START' AND cs.del_flag_ = '0' AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ != 1
         GROUP BY cs.class_group_id_
     </select>
     <select id="countCurrentNumByClassId" resultType="java.lang.Integer">
@@ -2389,7 +2389,7 @@
         <if test="teacherId != null">
             AND cs.actual_teacher_id_ = #{teacherId}
         </if>
-        AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0
+        AND cs.status_ = 'NOT_START' AND cs.del_flag_ = '0' AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ != 1
     </select>
 
     <select id="countExpendNumByClassGroupId" resultType="java.util.Map">
@@ -2398,7 +2398,7 @@
         <foreach collection="classGroupIds" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
-        AND cs.status_ != 'NOT_START' AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+        AND cs.status_ != 'NOT_START' AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         GROUP BY cs.class_group_id_
     </select>
     <select id="countExpendNumByClassGroupIds" resultType="java.util.Map">
@@ -2413,7 +2413,7 @@
         <if test="endClassDate != null">
             AND cs.class_date_ &lt;= DATE_FORMAT(#{endClassDate}, '%Y%m%d')
         </if>
-        AND cs.status_ != 'NOT_START' AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+        AND cs.status_ != 'NOT_START' AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND cs.is_lock_ = 0
         GROUP BY cs.class_group_id_
     </select>
 
@@ -2430,7 +2430,7 @@
                cssp.expect_price_
         FROM course_schedule cs
                  LEFT JOIN course_schedule_student_payment cssp ON cs.id_ = cssp.course_schedule_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
           <if test="groupType != null">
           AND cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           </if>
@@ -2508,7 +2508,7 @@
 
     <sql id="endFindCourseSchedulesCondition">
         <where>
-            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <include refid="queryVipCourseScheduleIds"/>
         </where>
     </sql>
@@ -2522,10 +2522,7 @@
             cs.organ_id_,cs.member_flag_,cs.new_course_id_,s.name_ schoole_name_,o.name_ organ_name_,
             CASE WHEN COUNT(CASE WHEN sa.id_ IS NULL OR (sa.status_ = 'LEAVE' AND sa.remark_ IS NOT NULL) THEN NULL ELSE 1 END) > 0 THEN 1 ELSE 0 END isCallNames,
             CASE WHEN COUNT(CASE WHEN ta.is_complaints_ = 1 THEN 1 ELSE NULL END) > 0 THEN '1' ELSE '0' END is_complaints_,
-            (
-                select group_concat(csd.id_) from course_schedule csd
-                where csd.del_flag_ = 0 and csd.id_ != csd.new_course_id_  and csd.new_course_id_ = cs.new_course_id_
-            ) as merged_course_ids_,GROUP_CONCAT(distinct CASE WHEN csts.teacher_role_ = 'TEACHING' THEN csts.user_id_ END) teachingTeacherIds
+            GROUP_CONCAT(distinct CASE WHEN csts.teacher_role_ = 'TEACHING' THEN csts.user_id_ END) teachingTeacherIds
         FROM
             course_schedule cs
             LEFT JOIN school s ON cs.schoole_id_=s.id_
@@ -2582,7 +2579,7 @@
         WHERE FIND_IN_SET(cs.class_group_id_, #{classGroupIds})
           AND cs.status_ = 'NOT_START'
           AND cs.class_date_ &gt;= DATE_FORMAT(#{fromDate}, "%Y-%m-%d")
-          AND (cs.del_flag_ IS NULL OR cs.del_flag_ = 0) AND cs.pre_course_flag_ = 0
+          AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
 
     <select id="findGroupCourseStartTime" resultType="java.util.Date">
@@ -2852,7 +2849,7 @@
         FROM course_schedule_student_payment cssp
                  LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
         WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND cs.pre_course_flag_ = 0
+        AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND cs.pre_course_flag_ != 1
         AND cssp.user_id_ = #{userId}
         <if test="groupType != null">
         and cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
@@ -2868,7 +2865,7 @@
           AND TIMESTAMPDIFF(MINUTE, #{endDateTime}, CONCAT(cs.class_date_, ' ', cs.start_class_time_)) &lt;= #{continueCourseTime}
           AND cs.teacher_id_ = #{courseSchedule.teacherId}
           AND cs.class_group_id_ = #{courseSchedule.classGroupId}
-          AND (NOW() > CONCAT(cs.class_date_,' ', cs.start_class_time_) OR sa.sign_in_time_ IS NOT NULL) AND cs.pre_course_flag_ = 0
+          AND (NOW() > CONCAT(cs.class_date_,' ', cs.start_class_time_) OR sa.sign_in_time_ IS NOT NULL) AND cs.pre_course_flag_ != 1
         LIMIT 1
     </select>
     <select id="queryTeacherContinueCourse" resultMap="CourseSchedule">
@@ -2879,7 +2876,7 @@
           AND TIMESTAMPDIFF(MINUTE, #{endDateTime}, CONCAT(cs.class_date_, ' ', cs.start_class_time_)) &lt;= #{continueCourseTime}
           AND cs.teacher_id_ = #{courseSchedule.teacherId}
           AND cs.class_group_id_ = #{courseSchedule.classGroupId}
-          AND (NOW() > CONCAT(cs.class_date_,' ', cs.start_class_time_) OR ta.sign_in_time_ IS NOT NULL) AND cs.pre_course_flag_ = 0
+          AND (NOW() > CONCAT(cs.class_date_,' ', cs.start_class_time_) OR ta.sign_in_time_ IS NOT NULL) AND cs.pre_course_flag_ != 1
         LIMIT 1
     </select>
     <select id="getSingleClassMinutes" resultType="java.lang.Integer">
@@ -2910,7 +2907,7 @@
             course_schedule cs
         WHERE CONCAT(cs.class_date_, ' ', cs.start_class_time_) &lt; NOW()
             AND cs.group_type_ = #{groupType}
-            AND cs.music_group_id_ = #{groupId} AND cs.pre_course_flag_ = 0
+            AND cs.music_group_id_ = #{groupId} AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCourses" resultMap="CourseSchedule">
         SELECT
@@ -2933,7 +2930,7 @@
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ = 0
+        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCourses2" resultMap="CourseSchedule">
         SELECT
@@ -2956,7 +2953,7 @@
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ = 0
+        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCourses3" resultMap="CourseSchedule">
         SELECT
@@ -2978,7 +2975,7 @@
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ = 0
+        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCoursesWithPay" resultMap="CourseSchedule">
         SELECT
@@ -3021,7 +3018,7 @@
                 AND del_flag_ = 0) c
         WHERE cs.class_group_id_ = c.class_group_id_
           AND CONCAT(cs.class_date_, " ", cs.start_class_time_) &lt;= c.class_date_
-          AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+          AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="findCourseSchedulesByClassGroups" resultMap="CourseSchedule">
         SELECT
@@ -3053,7 +3050,7 @@
         <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
             #{classGroupId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ = 0
+        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL ) AND cs.pre_course_flag_ != 1
         ORDER BY start_class_time_
     </select>
 
@@ -3080,7 +3077,7 @@
         FROM course_schedule cs
         WHERE cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           AND cs.music_group_id_ = #{groupId}
-            AND cs.del_flag_ = 0
+            AND cs.del_flag_ = '0'
         ORDER BY CONCAT(cs.class_date_, ' ', cs.start_class_time_)
         LIMIT 1
     </select>
@@ -3203,7 +3200,7 @@
         cs.status_
         FROM course_schedule cs
         LEFT JOIN course_schedule_evaluate cse ON cs.id_ = cse.course_schedule_id_
-        WHERE cs.group_type_ = #{groupType} AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.group_type_ = #{groupType} AND cs.pre_course_flag_ != 10 and cs.tenant_id_ = #{tenantId}
         <if test="groupId != null">
             AND cs.music_group_id_ = #{groupId}
         </if>
@@ -3218,7 +3215,7 @@
         FROM course_schedule cs
         WHERE cs.music_group_id_ = #{groupId}
           AND cs.group_type_ = #{groupType}
-          AND NOW() > CONCAT(cs.class_date_, ' ', cs.end_class_time_) AND cs.pre_course_flag_ = 0
+          AND NOW() > CONCAT(cs.class_date_, ' ', cs.end_class_time_) AND cs.pre_course_flag_ != 1
         ORDER BY cs.class_date_, cs.end_class_time_ ASC
         LIMIT 1
     </select>
@@ -3277,15 +3274,15 @@
         FROM course_schedule cs
         WHERE cs.music_group_id_ = #{groupId}
           AND cs.group_type_ = #{groupType}
-          AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+          AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="findCourseByGroupIds" resultMap="CourseSchedule">
         SELECT
         <include refid="resultSql"></include>
         FROM course_schedule cs
         WHERE cs.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-        AND cs.del_flag_ = 0
-        AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = 0) AND cs.pre_course_flag_ = 0
+        AND cs.del_flag_ = '0'
+        AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = 0) AND cs.pre_course_flag_ != 1
         AND cs.music_group_id_ IN
             <foreach collection="groupIds" item="groupId" open="(" close=")" separator=",">
                 #{groupId}
@@ -3300,7 +3297,7 @@
           AND ta.sign_in_time_ IS NOT NULL
           AND MONTH(ta.sign_in_time_) = #{month}
           AND cs.teach_mode_ = 'ONLINE'
-          AND ta.teacher_id_ = cs.actual_teacher_id_ AND cs.pre_course_flag_ = 0
+          AND ta.teacher_id_ = cs.actual_teacher_id_ AND cs.pre_course_flag_ != 1
         GROUP BY ta.course_schedule_id_
         HAVING COUNT(sa.id_) > 0
     </select>
@@ -3349,8 +3346,8 @@
         <if test="status != null">
             AND cs.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
-        AND (cs.is_lock_ IS NULL OR cs.is_lock_ =0)
-        AND (cs.del_flag_ IS NULL OR cs.del_flag_ =0)
+        AND cs.is_lock_ =0
+        AND cs.del_flag_ = '0'
         GROUP BY cssp.user_id_
     </select>
 
@@ -3383,8 +3380,8 @@
             #{studentId}
         </foreach>
         AND cssp.group_type_ = #{groupType}
-        AND (cs.is_lock_ IS NULL OR cs.is_lock_ =0)
-        AND (cs.del_flag_ IS NULL OR cs.del_flag_ =0)
+        AND cs.is_lock_ =0
+        AND cs.del_flag_ = '0'
         GROUP BY cssp.user_id_;
     </select>
 
@@ -3402,8 +3399,8 @@
         </foreach>
         AND cssp.group_type_ = 'VIP'
         AND vg.group_status_!=3
-        AND (cs.is_lock_ IS NULL OR cs.is_lock_ =0)
-        AND (cs.del_flag_ IS NULL OR cs.del_flag_ =0)
+        AND cs.is_lock_ =0
+        AND cs.del_flag_ = '0'
         GROUP BY cssp.user_id_;
     </select>
 
@@ -3412,7 +3409,7 @@
         WHERE cs.class_group_id_ = #{classGroupId}
         AND TIMESTAMPDIFF(MINUTE, CONCAT(cs.class_date_," ",cs.end_class_time_),#{startTime}) &lt;= #{continueCourseTime}
         AND TIMESTAMPDIFF(MINUTE, CONCAT(cs.class_date_," ",cs.end_class_time_),#{startTime}) >= 0
-        AND cs.actual_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+        AND cs.actual_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
         ORDER BY cs.class_date_ DESC,cs.end_class_time_ DESC
         LIMIT 1
     </select>
@@ -3421,7 +3418,7 @@
         WHERE cs.class_group_id_ = #{classGroupId}
         AND TIMESTAMPDIFF(MINUTE, #{endTime},CONCAT(cs.class_date_," ",cs.start_class_time_)) &lt;= #{continueCourseTime}
         AND TIMESTAMPDIFF(MINUTE, #{endTime},CONCAT(cs.class_date_," ",cs.start_class_time_)) >= 0
-        AND cs.actual_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+        AND cs.actual_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
         ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         LIMIT 1
     </select>
@@ -3444,12 +3441,12 @@
     <select id="getLastTime" resultType="java.util.Date">
         SELECT MAX(CONCAT(cs.class_date_," ",cs.end_class_time_))
         FROM course_schedule cs
-        WHERE cs.music_group_id_ = #{practiceGroupId} AND cs.del_flag_ = 0 AND cs.group_type_ = #{groupType};
+        WHERE cs.music_group_id_ = #{practiceGroupId} AND cs.del_flag_ = '0' AND cs.group_type_ = #{groupType};
     </select>
     <select id="getFirstTime" resultType="java.util.Date">
         SELECT MIN(CONCAT(cs.class_date_," ",cs.end_class_time_))
         FROM course_schedule cs
-        WHERE cs.music_group_id_ = #{practiceGroupId} AND cs.del_flag_ = 0 AND cs.group_type_ = #{groupType};
+        WHERE cs.music_group_id_ = #{practiceGroupId} AND cs.del_flag_ = '0' AND cs.group_type_ = #{groupType};
     </select>
     <select id="countStudentVipCoursesWithDate" resultType="map">
         SELECT
@@ -3530,14 +3527,14 @@
                cs.organ_id_ FROM course_schedule cs
         LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
         WHERE FIND_IN_SET(cs.class_group_id_,#{classGroupIds}) AND csts.teacher_role_ = #{teacherRole}
-        AND csts.user_id_ = #{teacherId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+        AND csts.user_id_ = #{teacherId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="queryHasReatClass" resultType="java.util.Map">
         SELECT cgtm.class_group_id_ 'key',CASE WHEN COUNT(cs.id_) > 0 THEN 1 ELSE 0 END 'value'
         FROM class_group_teacher_mapper cgtm
         LEFT JOIN course_schedule cs ON cs.class_group_id_ = cgtm.class_group_id_
-        AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.del_flag_ = 0
-        WHERE cgtm.user_id_ = #{teacherId} AND cgtm.group_type_ = 'MUSIC' AND cs.pre_course_flag_ = 0 AND cgtm.class_group_id_ IN
+        AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.del_flag_ = '0'
+        WHERE cgtm.user_id_ = #{teacherId} AND cgtm.group_type_ = 'MUSIC' AND cs.pre_course_flag_ != 1 AND cgtm.class_group_id_ IN
         <foreach collection="classGroupIds" item="classGroupId" separator="," open="(" close=")">
             #{classGroupId}
         </foreach>
@@ -3602,7 +3599,7 @@
             LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
         WHERE csts.user_id_=#{teacherId}
         AND cs.class_date_ = DATE_FORMAT(#{startClassTime},'%Y-%m-%d')
-        AND cs.start_class_time_ &lt; DATE_FORMAT(#{startClassTime},'%H:%i:%S') AND cs.pre_course_flag_ = 0
+        AND cs.start_class_time_ &lt; DATE_FORMAT(#{startClassTime},'%H:%i:%S') AND cs.pre_course_flag_ != 1
         AND ta.sign_in_status_ IS NOT NULL
         ORDER BY start_class_time_ DESC LIMIT 1;
     </select>
@@ -3612,12 +3609,12 @@
 		(SELECT cs.type_ course_type_,SUM(TIMESTAMPDIFF(MINUTE,STR_TO_DATE(concat(cs.class_date_,' ',cs.start_class_time_),'%Y-%m-%d %H:%i:%s'),
         STR_TO_DATE(concat(cs.class_date_,' ',cs.end_class_time_),'%Y-%m-%d %H:%i:%s'))) remain_minutes_,COUNT(cs.id_) temp_merged_course_num_
 		FROM course_schedule cs WHERE FIND_IN_SET(cs.class_group_id_,#{classGroupIdList}) AND cs.status_ = 'NOT_START'
-		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = 0) AND cs.member_flag_ = #{memberFlag} AND cs.pre_course_flag_ = 0 GROUP BY cs.type_
+		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = 0) AND cs.member_flag_ = #{memberFlag} AND cs.pre_course_flag_ != 1 GROUP BY cs.type_
 		UNION ALL
 		SELECT ncs.type_ course_type_,SUM(TIMESTAMPDIFF(MINUTE,STR_TO_DATE(concat(ncs.class_date_,' ',ncs.start_class_time_),'%Y-%m-%d %H:%i:%s'),
         STR_TO_DATE(concat(ncs.class_date_,' ',ncs.end_class_time_),'%Y-%m-%d %H:%i:%s'))) remain_minutes_,COUNT(cs.id_) temp_merged_course_num_
 		FROM course_schedule cs LEFT JOIN course_schedule ncs ON ncs.id_ = cs.new_course_id_
-		WHERE FIND_IN_SET(cs.class_group_id_,#{classGroupIdList}) AND cs.new_course_id_ &gt; 0 AND ncs.status_ = 'NOT_START' AND cs.pre_course_flag_ = 0 AND cs.member_flag_ = #{memberFlag} GROUP BY ncs.type_) a
+		WHERE FIND_IN_SET(cs.class_group_id_,#{classGroupIdList}) AND cs.new_course_id_ &gt; 0 AND ncs.status_ = 'NOT_START' AND cs.pre_course_flag_ != 1 AND cs.member_flag_ = #{memberFlag} GROUP BY ncs.type_) a
 		group BY a.course_type_
     </select>
 
@@ -3647,7 +3644,7 @@
             LEFT JOIN course_schedule_student_payment cssp ON cs.id_=cssp.course_schedule_id_
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
             LEFT JOIN organization o ON cs.organ_id_=o.id_
-        WHERE cs.organ_id_!=41 AND cs.del_flag_=0 AND cs.class_date_ >= '2020-11-01'
+        WHERE cs.organ_id_!=41 AND cs.del_flag_ = '0' AND cs.class_date_ >= '2020-11-01'
     </select>
 
     <select id="countCourseMergeTime" resultType="int">
@@ -3663,13 +3660,13 @@
     <select id="querySubCourseNumMap" resultType="java.util.Map">
         SELECT cs.type_ 'key',COUNT(CASE WHEN (CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()) THEN 1 ELSE NULL END) 'value'
         FROM course_schedule cs
-        WHERE cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ = 0
+        WHERE cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
         GROUP BY cs.type_
     </select>
     <select id="querySubCourseTimeMap" resultType="java.util.Map">
         SELECT cs.type_ 'key',SUM(ROUND((UNIX_TIMESTAMP(CONCAT(cs.class_date_,' ',cs.end_class_time_)) - UNIX_TIMESTAMP(CONCAT(cs.class_date_,' ',cs.start_class_time_)))/60)) 'value'
         FROM course_schedule cs
-        WHERE cs.class_group_id_ = #{classGroupId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.pre_course_flag_ = 0
+        WHERE cs.class_group_id_ = #{classGroupId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.pre_course_flag_ != 1
         GROUP BY cs.type_
     </select>
     <select id="findClassMaxCourseNumMap" resultType="java.util.Map">
@@ -3678,7 +3675,7 @@
         <foreach collection="classGroupIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        AND CONCAT(cs.class_date_," ",cs.start_class_time_) > NOW() AND cs.pre_course_flag_ = 0
+        AND CONCAT(cs.class_date_," ",cs.start_class_time_) > NOW() AND cs.pre_course_flag_ != 1
         GROUP BY cs.class_group_id_,cs.type_)c
         GROUP BY c.type_
     </select>
@@ -3695,7 +3692,7 @@
                 #{item}
             </foreach>
         </if>
-        AND CONCAT(cs.class_date_," ",cs.start_class_time_) > NOW() AND cs.pre_course_flag_ = 0
+        AND CONCAT(cs.class_date_," ",cs.start_class_time_) > NOW() AND cs.pre_course_flag_ != 1
         GROUP BY cssp.course_schedule_id_
     </select>
     <select id="findNoStudentCourseIds" resultType="Long">
@@ -3754,7 +3751,7 @@
             LEFT JOIN practice_group vg ON vg.id_ = cs.music_group_id_
         </if>
         WHERE cssp.user_id_ = #{studentId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()
-        AND vg.educational_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+        AND vg.educational_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
         <include refid="global.limit"/>
     </select>
     <select id="countStudentNoStartCourse" resultType="int">
@@ -3767,7 +3764,7 @@
             LEFT JOIN practice_group vg ON vg.id_ = cs.music_group_id_
         </if>
         WHERE cssp.user_id_ = #{studentId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()
-        AND vg.educational_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+        AND vg.educational_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
     </select>
     <select id="findCoursesByClassGroupIdAndCourseIds" resultMap="CourseSchedule">
         SELECT * FROM course_schedule WHERE class_group_id_ = #{classGroupId}
@@ -3795,7 +3792,7 @@
             AND cs.start_class_time_ >= DATE_FORMAT(#{startTime},'%H:%i:%S')
             AND cs.end_class_time_ <= DATE_FORMAT(#{endTime},'%H:%i:%S')
             AND cs.group_type_ = 'MUSIC'
-            AND cs.teach_mode_ = 'OFFLINE' AND cs.pre_course_flag_ = 0
+            AND cs.teach_mode_ = 'OFFLINE' AND cs.pre_course_flag_ != 1
         ORDER BY cs.id_ ASC
     ]]></select>
     <select id="findHasCourseStudent" resultType="java.lang.Integer">
@@ -3855,11 +3852,10 @@
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
             LEFT JOIN school s ON cs.schoole_id_=s.id_
-        WHERE
-            ( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
-            AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0'
+            AND cs.is_lock_=0
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
-            AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+            AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
             <if test="startDay!=null and startDay!=''">
                 AND cs.class_date_ &gt;= #{startDay}
             </if>
@@ -3876,10 +3872,10 @@
 
     <sql id="queryTeacherCourseCondition">
         <where>
-            ( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
-            AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+            cs.del_flag_ = '0'
+            AND cs.is_lock_=0
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
-            AND cs.class_date_ &gt;= "2021-03-01" AND cs.pre_course_flag_ = 0
+            AND cs.class_date_ &gt;= "2021-03-01" AND cs.pre_course_flag_ != 1
             <if test="teacherId!=null">
                 AND csts.user_id_ = #{teacherId}
             </if>
@@ -3984,7 +3980,7 @@
         SELECT CONCAT(cs.class_date_,' ',cs.start_class_time_,'~',end_class_time_) start_class_time_ FROM course_schedule cs
         WHERE cs.class_date_ BETWEEN #{dto.startSchoolTerm} AND #{dto.endSchoolTerm}
         AND cs.class_group_id_ = #{dto.classGroupId} AND cs.type_ = #{dto.courseScheduleType}
-        AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND cs.del_flag_ = 0
+        AND cs.is_lock_ = 0 AND cs.pre_course_flag_ != 1 AND cs.del_flag_ = '0'
         ORDER BY cs.class_date_,cs.start_class_time_
     </select>
     <select id="countCourseByClassAndType" resultType="int">
@@ -3996,7 +3992,7 @@
         <if test="dto.endSchoolTerm != null">
             AND cs.class_date_ &lt;= DATE_FORMAT(#{dto.endSchoolTerm}, '%Y%m%d')
         </if>
-        AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND cs.is_lock_ = 0
     </select>
     <select id="getCourseNumNo" resultType="int">
         SELECT COUNT(id_) FROM course_schedule
@@ -4052,7 +4048,7 @@
     <select id="queryHasCourseStudentIds" resultType="java.lang.Integer">
         SELECT DISTINCT s.user_id_ FROM student s
         LEFT JOIN course_schedule_student_payment cssp ON s.user_id_ = cssp.user_id_
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.group_type_ = #{groupType} AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.group_type_ = #{groupType} AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         LEFT JOIN sys_user su ON su.id_ = s.user_id_
         WHERE 1=1 and s.tenant_id_ = #{tenantId}
         <if test="hasMember != null">
@@ -4100,7 +4096,7 @@
     <sql id="queryCourseEvaluateSql">
         <where>
             cs.status_ = 'OVER' AND ta.sign_in_time_ IS NOT NULL AND cs.group_type_ != 'LIVE'
-            AND cs.del_flag_ = 0 AND (cs.is_lock_ = 0 OR cs.is_lock_ IS NULL) AND cs.pre_course_flag_ = 0
+            AND cs.del_flag_ = '0' AND (cs.is_lock_ = 0 OR cs.is_lock_ IS NULL) AND cs.pre_course_flag_ != 1
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND sa.id_ IS NOT NULL
             <if test="teacherId != null">
                 AND ta.teacher_id_ = #{teacherId}
@@ -4368,7 +4364,7 @@
         select cs.type_ scheduleType,COUNT(CASE WHEN cs.status_ = 'NOT_START' THEN 1 END) subCourseNum,
                COUNT(cs.id_) totalCourseNum
         from course_schedule cs
-        where cs.group_type_ = 'MUSIC' AND cs.is_lock_ = 0 AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
+        where cs.group_type_ = 'MUSIC' AND cs.is_lock_ = 0 AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
         AND cs.class_date_ BETWEEN #{startTerm} AND #{endTerm}
         AND cs.music_group_id_ IN
         <foreach collection="musicGroupIds" item="musicGroupId" open="(" separator="," close=")">
@@ -4386,7 +4382,7 @@
     <select id="getDailySummaryOfClassesForTheCurrentSemester" resultMap="DailySummaryMap">
         select cs.class_date_ courseDate,cs.type_ scheduleType,COUNT(cs.id_) totalCourseNum
         from course_schedule cs
-        where cs.group_type_ = 'MUSIC' AND cs.is_lock_ = 0 AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
+        where cs.group_type_ = 'MUSIC' AND cs.is_lock_ = 0 AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
         AND cs.class_date_ BETWEEN #{startTerm} AND #{endTerm}
         AND cs.music_group_id_ IN
         <foreach collection="musicGroupIds" item="musicGroupId" open="(" separator="," close=")">
@@ -4398,7 +4394,7 @@
         select cs.id_ courseId,CONCAT(cs.class_date_,' ',cs.start_class_time_,'~',cs.end_class_time_) classDate,cs.status_ courseStatus,cs.name_ courseName,
         actual_teacher_id_ teacherId,cs.music_group_id_ musicGroupId,cs.teach_mode_ teachMode
         from course_schedule cs
-        where cs.group_type_ = 'MUSIC' AND cs.is_lock_ = 0 AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
+        where cs.group_type_ = 'MUSIC' AND cs.is_lock_ = 0 AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
         <if test="classDate != null and classDate != ''">
             AND cs.class_date_ = #{classDate}
         </if>
@@ -4470,7 +4466,7 @@
     <select id="getTeacherContinuousCourse" resultMap="CourseSchedule">
         SELECT <include refid="resultSql"/> FROM course_schedule cs
         WHERE cs.class_group_id_ = #{classGroupId}
-        AND cs.actual_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ = 0 AND cs.class_date_ = #{classDate}
+        AND cs.actual_teacher_id_ = #{teacherId} AND cs.pre_course_flag_ != 1 AND cs.class_date_ = #{classDate}
         ORDER BY cs.class_date_ DESC,cs.end_class_time_ DESC
     </select>
 
@@ -4482,7 +4478,7 @@
         left join course_schedule_student_payment cssp ON cs.id_ = cssp.course_schedule_id_
         left join organization o ON o.id_ = cs.organ_id_
         where DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cssp.actual_price_ > 0
-          AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ = 0
+          AND cs.del_flag_ = '0' AND cs.is_lock_ = 0 and cs.pre_course_flag_ != 1
           AND cs.tenant_id_ = 1
         group by cs.id_ order by cs.organ_id_;
     </select>

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

@@ -171,8 +171,7 @@
 
     <sql id="practiceGroupReviewsQueryCondition">
         <where>
-            AND pg.id_ > 0 AND cs.group_type_='PRACTICE' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS
-            NULL)
+            AND pg.id_ > 0 AND cs.group_type_='PRACTICE' AND cs.status_='OVER' AND cs.del_flag_ = '0'
             <if test="search!=null and search!=''">
                 AND (cs.name_ LIKE CONCAT('%',#{search},'%') OR cs.id_= #{search})
             </if>
@@ -425,8 +424,9 @@
 
     <sql id="courseReviewsQueryCondition">
         <where>
-            AND cs.type_ IN ('PRACTICE','VIP') AND cs.teach_mode_='ONLINE' AND cs.status_='OVER' AND (cs.del_flag_ = 0
-            OR cs.del_flag_ IS NULL) and cs.tenant_id_ = #{tenantId}
+            AND cs.type_ IN ('PRACTICE','VIP') AND cs.teach_mode_='ONLINE'
+            AND cs.status_='OVER' AND cs.del_flag_ = '0'
+            and cs.tenant_id_ = #{tenantId}
             <if test="search!=null and search!=''">
                 AND (cs.name_ LIKE CONCAT('%',#{search},'%') OR cs.id_= #{search})
             </if>
@@ -513,7 +513,7 @@
 
     <sql id="vipGroupReviewsQueryCondition">
         <where>
-            AND vg.id_ > 0 AND cs.group_type_='VIP' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS NULL) and cs.tenant_id_ = #{tenantId}
+            AND vg.id_ > 0 AND cs.group_type_='VIP' AND cs.status_='OVER' AND cs.del_flag_ = '0' and cs.tenant_id_ = #{tenantId}
             <if test="search!=null and search!=''">
                 AND (cs.name_ LIKE CONCAT('%',#{search},'%') OR cs.id_= #{search})
             </if>

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

@@ -256,7 +256,7 @@
 			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
 			AND cssp.user_id_ = #{userId}
 			AND CONCAT(cs.class_date_	,' ',cs.start_class_time_) > NOW()
-			AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ = 0
+			AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
     </select>
 	<select id="countAllCourseFee" resultType="java.math.BigDecimal">
 		SELECT
@@ -266,7 +266,7 @@
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 		WHERE
 		(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-		AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ = 0
+		AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
     </select>
 	<select id="findNotStartCourseStudentPaymentIdsWithClassGroupAndStudent" resultType="int">
 		SELECT
@@ -277,7 +277,7 @@
 		WHERE
 			cssp.class_group_id_ = #{classGroupId}
 			AND cssp.user_id_ = #{userId}
-			AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.pre_course_flag_ = 0
+			AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.pre_course_flag_ != 1
 	</select>
 	<select id="findNotStartCourseStudentPaymentsWithClassGroupAndStudent" resultMap="CourseScheduleStudentPayment">
 		SELECT
@@ -288,7 +288,7 @@
 		WHERE
 			cssp.class_group_id_ = #{classGroupId}
 			AND cssp.user_id_ = #{userId}
-			AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.pre_course_flag_ = 0
+			AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.pre_course_flag_ != 1
 	</select>
 
     <select id="findVipGroupCoursePrice" resultType="java.math.BigDecimal">
@@ -312,7 +312,7 @@
 			#{item}
 		</foreach>
 		AND cs.group_type_ = #{groupType} AND cssp.user_id_ = #{userId}
-		AND cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+		AND cs.status_ = 'NOT_START' AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
 		GROUP BY cssp.music_group_id_
 	</select>
     <select id="countStudentCourseNumWithGroup" resultType="int">
@@ -473,7 +473,7 @@
 			LEFT JOIN course_schedule_student_payment cssp ON s.user_id_=cssp.user_id_
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 			LEFT JOIN class_group_teacher_mapper cgtm ON cssp.class_group_id_=cgtm.class_group_id_
-		WHERE cs.type_ IN ('PRACTICE', 'VIP', 'SINGLE', 'MIX') AND cs.pre_course_flag_ = 0 AND cgtm.teacher_role_='BISHOP' and s.tenant_id_ = #{tenantId};
+		WHERE cs.type_ IN ('PRACTICE', 'VIP', 'SINGLE', 'MIX') AND cs.pre_course_flag_ != 1 AND cgtm.teacher_role_='BISHOP' and s.tenant_id_ = #{tenantId};
 	</select>
     <select id="findCoursePayment" resultType="map">
 		SELECT
@@ -495,7 +495,7 @@
 		<if test="courseScheduleType != null">
 		AND cs.type_= #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 		</if>
-		AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) &gt; NOW() AND cs.pre_course_flag_ = 0 AND cs.del_flag_ = 0 AND cs.is_lock_ = 0
+		AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) &gt; NOW() AND cs.pre_course_flag_ != 1 AND cs.del_flag_ = '0' AND cs.is_lock_ = 0
 	</select>
 	<select id="countStudentsNotStartCourseNumWithCourseType" resultType="map">
 		SELECT cssp.user_id_ 'key',COUNT(DISTINCT cssp.course_schedule_id_) 'value'
@@ -508,7 +508,7 @@
 		<if test="courseScheduleType != null">
 			AND cs.type_= #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 		</if>
-		AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) &gt; NOW() AND cs.pre_course_flag_ = 0 AND cs.del_flag_ = 0 AND cs.is_lock_ = 0
+		AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) &gt; NOW() AND cs.pre_course_flag_ != 1 AND cs.del_flag_ = '0' AND cs.is_lock_ = 0
 		GROUP BY cssp.user_id_
 	</select>
 	<select id="queryMidiByUserIdsAndCourseId" resultType="java.util.Map">
@@ -573,7 +573,7 @@
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 		WHERE
 			cssp.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-			AND cssp.music_group_id_ = #{groupId} AND cs.pre_course_flag_ = 0
+			AND cssp.music_group_id_ = #{groupId} AND cs.pre_course_flag_ != 1
 			AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) > NOW( )
 	</select>
 
@@ -588,7 +588,7 @@
 		<foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
 			#{classGroupId}
 		</foreach>
-        AND cs.status_ = 'NOT_START' AND cs.pre_course_flag_ = 0 ORDER BY cssp.id_ ASC
+        AND cs.status_ = 'NOT_START' AND cs.pre_course_flag_ != 1 ORDER BY cssp.id_ ASC
 	</select>
 
 	<select id="findStudentLastCourseSchedule" resultType="java.util.Map">
@@ -603,7 +603,7 @@
 			<foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
 				#{studentId}
 			</foreach>
-			AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &lt; NOW( ) AND cs.pre_course_flag_ = 0
+			AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &lt; NOW( ) AND cs.pre_course_flag_ != 1
 		GROUP BY user_id_;
 	</select>
 
@@ -662,7 +662,7 @@
 			LEFT JOIN course_schedule cs1 ON cs.new_course_id_=cs1.id_
 		WHERE
 			cssp.batch_no_ IS NOT NULL
-			AND cs.id_ IS NOT NULL AND cs.pre_course_flag_ = 0
+			AND cs.id_ IS NOT NULL AND cs.pre_course_flag_ != 1
 			AND (((cs.status_ IN ('OVER', 'UNDERWAY') OR cs1.status_ IN ( 'OVER', 'UNDERWAY' ))
 			          AND (cssp.actual_price_ IS NULL OR cssp.actual_price_ &lt; cssp.expect_price_))
 			OR ( cs.status_ = 'NOT_START' AND cssp.actual_price_ IS NOT NULL AND cssp.actual_price_ &gt; 0))
@@ -702,7 +702,7 @@
 				#{item}
 			</foreach>
 		</if>
-		AND CONCAT(cs.class_date_," ",cs.start_class_time_) > NOW() AND cs.pre_course_flag_ = 0
+		AND CONCAT(cs.class_date_," ",cs.start_class_time_) > NOW() AND cs.pre_course_flag_ != 1
 		GROUP BY cssp.id_
 	</select>
 	<select id="queryByIdsAndStudentId" resultMap="CourseScheduleStudentPayment">
@@ -729,7 +729,7 @@
 		  </if>
 		  AND cs.class_date_&lt;#{monday}
 		  AND cs.type_=#{courseType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-		  AND (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+		  AND (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
 		ORDER BY CONCAT(cs.class_date_, ' ', cs.start_class_time_) DESC LIMIT 1
 	</select>
 
@@ -743,7 +743,7 @@
 		SELECT SUM(cssp.expect_price_) FROM course_schedule_student_payment cssp
 		LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
 		WHERE cssp.class_group_id_ = #{classGroupId} AND cssp.user_id_ = #{studentId} AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()
-		AND cs.pre_course_flag_ = 0
+		AND cs.pre_course_flag_ != 1
 	  <if test="courseType != null">
 		  AND cs.type_ = #{courseType}
 	  </if>
@@ -789,7 +789,7 @@
     <select id="getHasVipCourseStudentIds" resultType="int">
 		SELECT cssp.user_id_ FROM course_schedule_student_payment cssp
 		LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
-		WHERE cssp.group_type_='VIP' AND cs.del_flag_=0
+		WHERE cssp.group_type_='VIP' AND cs.del_flag_ = '0'
 		<if test="studentIds!=null and studentIds.size()>0">
 			AND cssp.user_id_ IN
 			<foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
@@ -808,7 +808,7 @@
 		WHERE
 			cssp.group_type_ IN ('VIP', 'PRACTICE')
 			AND cs.status_='NOT_START'
-			AND su.del_flag_ = 0
+			AND su.del_flag_ = '0'
 			AND su.organ_id_ = #{organId}
 	</select>
 
@@ -823,7 +823,7 @@
 		WHERE
 			cssp.group_type_ IN ('VIP', 'PRACTICE')
 			  AND cs.status_='NOT_START'
-			  AND su.del_flag_ = 0
+			  AND su.del_flag_ = '0'
 			<if test="studentIds!=null and studentIds.size()>0">
 				AND su.organ_id_ IN
 				<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -1115,7 +1115,7 @@
 		select cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' from course_schedule_student_payment cssp
 		left join course_schedule cs ON cs.id_ = cssp.course_schedule_id_
 		where cs.class_date_ BETWEEN #{cutFirstDayOfMonth} AND #{cutLastDayOfMonth} AND cssp.actual_price_ > 0
-		AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ = 0 AND cs.tenant_id_ = 1
+		AND cs.del_flag_ = '0' AND cs.is_lock_ = 0 and cs.pre_course_flag_ != 1 AND cs.tenant_id_ = 1
 		group by cs.organ_id_
 	</select>
 

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

@@ -188,7 +188,7 @@
 
 	<sql id="courseScheduleTeacherSalaryQueryPage">
 		<where>
-			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
 			AND csts.settlement_time_ IS NOT NULL AND csts.teacher_role_ IS NOT NULL AND cs.type_ IS NOT NULL
 			<if test="organId != null">
 				AND su.organ_id_ = #{organId}
@@ -313,7 +313,7 @@
 		</if>
 		AND cs.group_type_ IN ('VIP','LIVE') AND vg.organ_id_ != 41
 		AND csts.settlement_time_ IS NULL
-		AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+		AND cs.del_flag_ = '0'
     </select>
     <select id="findTeacherCourseSalaryNoSettlement" resultMap="CourseScheduleTeacherSalary">
 		SELECT
@@ -331,7 +331,7 @@
 		</if>
 		AND cs.group_type_ = #{groupType}
 		AND csts.settlement_time_ IS NULL
-		AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+		AND cs.del_flag_ = '0'
     </select>
     
     <select id="queryByCourseScheduleIdAndUserId" resultMap="CourseScheduleTeacherSalary" parameterType="map">
@@ -442,7 +442,7 @@
 		FROM
 			course_schedule cs
 			LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
-		WHERE cs.class_group_id_ = #{classGroupId} AND cs.id_ IS NOT NULL AND cs.status_='OVER' AND cs.pre_course_flag_ = 0
+		WHERE cs.class_group_id_ = #{classGroupId} AND cs.id_ IS NOT NULL AND cs.status_='OVER' AND cs.pre_course_flag_ != 1
 		GROUP BY cs.teach_mode_
     </select>
 
@@ -456,7 +456,7 @@
 			</if>
 			csts.update_time_ = now()
 		WHERE csts.user_id_ = #{userId} AND csts.class_group_id_ = #{classGroupId} AND csts.settlement_time_ IS NULL
-		  AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &gt;= #{startDateTime} AND cs.pre_course_flag_ = 0
+		  AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &gt;= #{startDateTime} AND cs.pre_course_flag_ != 1
 	</update>
 	
     <update id="batchUpdateTeacherExpectSalary">
@@ -612,7 +612,7 @@
 		WHERE
 			csts.group_type_ = #{groupType}
 			AND csts.music_group_id_ = #{groupId}
-			AND CONCAT(cs.class_date_, ' ', cs.start_class_time_)>NOW() AND cs.pre_course_flag_ = 0
+			AND CONCAT(cs.class_date_, ' ', cs.start_class_time_)>NOW() AND cs.pre_course_flag_ != 1
 	</select>
 
     <delete id="deleteByMusicGroupId" parameterType="map" >
@@ -633,7 +633,7 @@
 		FROM course_schedule_teacher_salary ts
 		LEFT JOIN course_schedule cs ON ts.course_schedule_id_ = cs.id_
 		WHERE FIND_IN_SET(cs.type_, #{typeList}) AND ts.user_id_ = #{userId} AND ts.settlement_time_ IS NULL
-		AND cs.class_date_ &gt;= #{startClassDate} AND cs.pre_course_flag_ = 0
+		AND cs.class_date_ &gt;= #{startClassDate} AND cs.pre_course_flag_ != 1
 	</select>
     <select id="findByTeacher" resultMap="CourseScheduleTeacherSalary">
 		SELECT
@@ -746,7 +746,7 @@
 		LEFT JOIN school s ON s.id_ = cs.schoole_id_
 		LEFT JOIN music_group mg ON mg.id_ = ts.music_group_id_ AND ts.group_type_ = 'MUSIC'
 		LEFT JOIN organization mgo ON mgo.id_ = cs.organ_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.`del_flag_` = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ = 0
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.`del_flag_` = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ != 1
 		AND cs.group_type_ = 'MUSIC' AND ts.settlement_time_ IS NOT NULL
 		AND t.is_settlement_salary_ = 1 and ts.tenant_id_ = #{tenantId}
 		<if test="courseTypeList != null">
@@ -785,7 +785,7 @@
 		LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_ = vga.id_
 		LEFT JOIN organization vgo ON vgo.id_ = cs.organ_id_
 		left join vip_group_category vgc on vgc.id_ = vg.vip_group_category_id_
-		WHERE vg.organ_id_ != 41 AND DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.`del_flag_` = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ = 0
+		WHERE vg.organ_id_ != 41 AND DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.`del_flag_` = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ != 1
 		AND cs.group_type_ = #{groupType} AND ts.settlement_time_ IS NOT NULL
 		AND t.is_settlement_salary_ = 1 and ts.tenant_id_ = #{tenantId}
 		<if test="courseTypeList != null">
@@ -824,7 +824,7 @@
 		LEFT JOIN `student_attendance` sa ON sa.`course_schedule_id_` = ts.`course_schedule_id_`
 		LEFT JOIN practice_group pg ON pg.id_ = ts.music_group_id_ AND ts.group_type_ = 'PRACTICE'
 		LEFT JOIN organization pgo ON pgo.id_ = cs.organ_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.`del_flag_` = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ = 0
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.`del_flag_` = 0 AND cs.is_lock_ = 0 and cs.pre_course_flag_ != 1
 		AND cs.group_type_ = 'PRACTICE' AND ts.settlement_time_ IS NOT NULL
 		AND t.is_settlement_salary_ = 1 and ts.tenant_id_ = #{tenantId}
 		<if test="courseTypeList != null">
@@ -851,7 +851,7 @@
     <select id="countTeacherGiveLesson" resultType="java.lang.Integer">
 		SELECT COUNT(DISTINCT csts.id_) FROM course_schedule_teacher_salary csts
 		LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-		WHERE NOW() >= CONCAT(cs.class_date_ ,' ',cs.end_class_time_) AND csts.user_id_ = #{userId} AND cs.pre_course_flag_ = 0
+		WHERE NOW() >= CONCAT(cs.class_date_ ,' ',cs.end_class_time_) AND csts.user_id_ = #{userId} AND cs.pre_course_flag_ != 1
 	</select>
 
 	<resultMap id="TeacherCourseSalaryDetail4WebDto" type="com.ym.mec.biz.dal.dto.TeacherCourseSalaryDetail4WebDto">
@@ -880,7 +880,7 @@
 
 	<sql id="queryCourseSalaryCondition">
 		<where>
-			(cs.del_flag_ IS NULL OR cs.del_flag_=0)
+			cs.del_flag_ = '0'
             AND csts.group_type_!='COMM'
 			AND csts.settlement_time_ IS NOT NULL
 			AND t.is_settlement_salary_ = 1 and csts.tenant_id_ = #{tenantId}
@@ -995,7 +995,7 @@
 			course_schedule_teacher_salary csts
 			LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
 		WHERE
-			( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
+			cs.del_flag_ = '0'
 			AND csts.settlement_time_ IS NOT NULL
 			AND csts.user_id_ = #{teacherId}
 			AND DATE_FORMAT( cs.class_date_, '%Y-%m' ) = #{month}
@@ -1010,8 +1010,8 @@
 			course_schedule_teacher_salary csts
 			LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
 		WHERE
-			( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
-			AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+			cs.del_flag_ = '0'
+			AND cs.is_lock_=0
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
 			AND csts.settlement_time_ IS NOT NULL
 			AND csts.user_id_ = #{teacherId}
@@ -1026,7 +1026,7 @@
 			course_schedule_teacher_salary csts
 			LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
 		WHERE
-			( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
+		cs.del_flag_ = '0'
 			AND csts.group_type_!='COMM'
 			AND csts.settlement_time_ IS NOT NULL and csts.tenant_id_ = #{tenantId}
 			<if test="teacherId!=null">
@@ -1041,7 +1041,7 @@
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
         WHERE
-        	( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
+			cs.del_flag_ = '0'
 			AND csts.group_type_!='COMM'
         	AND csts.settlement_time_ IS NOT NULL and csts.tenant_id_ = #{tenantId}
         	AND DATE_FORMAT( cs.class_date_, '%Y-%m' ) = #{month}
@@ -1125,7 +1125,7 @@
 			LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
 		WHERE
 			cs.class_date_ BETWEEN #{startDate} AND #{endDate}
-		  AND ( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
+		  AND cs.del_flag_ = '0'
 		  AND csts.settlement_time_ IS NOT NULL and csts.tenant_id_ = #{tenantId}
 	</select>
 
@@ -1148,10 +1148,10 @@
 			LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
 			LEFT JOIN school s ON cs.schoole_id_=s.id_
 		WHERE
-			( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
-			AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+		cs.del_flag_ = '0'
+			AND cs.is_lock_=0
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
-			AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ = 0
+			AND csts.user_id_ = #{teacherId} AND cs.pre_course_flag_ != 1
 			<if test="startClassDay!=null and startClassDay!=''">
 				AND cs.class_date_ &gt;= #{startClassDay}
 			</if>
@@ -1176,8 +1176,8 @@
 			course_schedule_teacher_salary csts
 				LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
 		WHERE
-			( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
-			AND ( cs.is_lock_ = 0 OR cs.is_lock_ IS NULL )
+		cs.del_flag_ = '0'
+			AND cs.is_lock_ = 0
 			AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
 			AND csts.user_id_ = #{teacherId}
 			<if test="year!=null">
@@ -1203,8 +1203,8 @@
 		FROM course_schedule_teacher_salary csts
 			LEFT JOIN course_schedule cs ON cs.id_=csts.course_schedule_id_
 		WHERE cs.class_date_ = CURDATE()
-			AND ( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
-			AND ( cs.is_lock_ = 0 OR cs.is_lock_ IS NULL )
-			AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ ) AND cs.pre_course_flag_ = 0
+			AND cs.del_flag_ = '0'
+			AND cs.is_lock_ = 0
+			AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ ) AND cs.pre_course_flag_ != 1
 	</select>
 </mapper>

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

@@ -297,7 +297,11 @@
 	</select>
     <select id="countTeacherDemoGroupNum" resultType="java.util.Map">
 		SELECT dg.user_id_ `key`,COUNT(dg.id_) `value` FROM demo_group dg
-        WHERE FIND_IN_SET(dg.user_id_,#{teacherIds}) GROUP BY user_id_
+        WHERE dg.user_id_ IN
+        <foreach collection="teachers" item="teacherId" open="(" separator="," close=")">
+            #{teacherId}
+        </foreach>
+        GROUP BY user_id_
 	</select>
 
 	<select id="queryDemoGroupNum" resultType="map">
@@ -314,7 +318,7 @@
     	select count(cs.id_) from course_schedule cs
         left join demo_group vg on cs.music_group_id_ = vg.id_
         where cs.type_ = 'DEMO'
-  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_ is null) and INTE_ARRAY(vg.organ_id_list_,'36,38') = 0
+  		and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and cs.del_flag_ = '0' and INTE_ARRAY(vg.organ_id_list_,'36,38') = 0
         <if test="organIds != null">
             AND INTE_ARRAY(vg.organ_id_list_,#{organIds})
         </if>

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

@@ -248,7 +248,7 @@
             LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
         </if>
         <where>
-            su.del_flag_ = 0 and su.tenant_id_ = #{tenantId}
+            su.del_flag_ = '0' and su.tenant_id_ = #{tenantId}
             <if test="lockFlag != null">
                 AND su.lock_flag_ = #{lockFlag}
             </if>
@@ -284,7 +284,7 @@
             LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
         </if>
         <where>
-            su.del_flag_ = 0 and su.tenant_id_ = #{tenantId}
+            su.del_flag_ = '0' and su.tenant_id_ = #{tenantId}
             <if test="organId != null">
                 AND INTE_ARRAY(e.organ_id_list_,#{organId})
             </if>
@@ -319,7 +319,7 @@
             LEFT JOIN sys_user_role sur ON su.id_ = sur.user_id_
             LEFT JOIN employee e ON e.user_id_ = su.id_
         WHERE
-            su.lock_flag_ = 0 AND su.del_flag_ = 0 AND FIND_IN_SET(sur.role_id_, #{roleIds})
+            su.lock_flag_ = 0 AND su.del_flag_ = '0' AND FIND_IN_SET(sur.role_id_, #{roleIds})
             <if test="organIds!=null and organIds!=''">
                 AND INTE_ARRAY(e.organ_id_list_,#{organIds})
             </if>
@@ -344,7 +344,7 @@
         SELECT COUNT(DISTINCT cs.id_)
         FROM course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+        AND CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW() AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         WHERE csts.user_id_ = #{employeeId}
     </select>
 
@@ -443,7 +443,7 @@
     </select>
     <sql id="queryEmployeeBasicInfoSql">
         <where>
-            e.demission_date_ IS NULL AND su.lock_flag_ = 0 AND su.del_flag_ = 0
+            e.demission_date_ IS NULL AND su.lock_flag_ = 0 AND su.del_flag_ = '0'
             <if test="search != null and search != ''">
                 AND (e.user_id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
             </if>

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

@@ -218,11 +218,11 @@
 
 	<select id="getStudentSignUpData" resultMap="IndexBaseMonthData">
 		SELECT
-			organ_id_,su.tenant_id_,
+			su.organ_id_,su.tenant_id_,
 			#{dayStr} month_,
-			COUNT( id_ ) total_num_,
-			COUNT(CASE WHEN password_ IS NOT NULL THEN id_ ELSE NULL END) activate_num_,
-			TRUNCATE(COUNT(CASE WHEN password_ IS NOT NULL THEN id_ ELSE NULL END)/COUNT( id_ )*100, 2) percent_
+			COUNT( su.id_ ) total_num_,
+			COUNT(CASE WHEN su.password_ IS NOT NULL THEN su.id_ ELSE NULL END) activate_num_,
+			TRUNCATE(COUNT(CASE WHEN su.password_ IS NOT NULL THEN su.id_ ELSE NULL END)/COUNT( su.id_ )*100, 2) percent_
 		FROM
 			((
 				 SELECT DISTINCT
@@ -231,7 +231,7 @@
 					 student_registration sr
 					LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 				 WHERE
-					 mg.status_ IN ( 'PREPARE', 'PROGRESS' )
+					 mg.status_ IN ( 'PREPARE', 'PROGRESS' ) and sr.tenant_id_ = #{tenantId}
 				   AND sr.music_group_status_ = 'NORMAL'
 				   AND DATE_FORMAT(sr.create_time_, '%Y-%m-%d')&lt;=#{dayStr}
 			 ) UNION ALL
@@ -242,21 +242,18 @@
 				course_schedule_student_payment cssp
 				LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 			 WHERE
-				 cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
-			   AND ( cs.is_lock_ = 0 OR cs.is_lock_ IS NULL )
+				 cs.del_flag_ = '0' AND cs.pre_course_flag_ = 0 and cssp.tenant_id_ = #{tenantId} AND cs.is_lock_ = 0
 			   AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
 			   AND cssp.group_type_ IN ('VIP', 'PRACTICE')
-			   AND cs.organ_id_ IS NOT NULL
 			   AND DATE_FORMAT(cssp.create_time_, '%Y-%m-%d')&lt;=#{dayStr}
 				AND cs.class_date_ &gt;= #{courseStartDay}
 			)) u
-			LEFT JOIN sys_user su ON u.user_id_ = su.id_
+			LEFT JOIN student st ON u.user_id_ = st.user_id_
+			LEFT JOIN sys_user su ON st.user_id_ = su.id_
 		WHERE
-			del_flag_=0 and su.tenant_id_ = #{tenantId}
-		  	AND organ_id_ IS NOT NULL
-			AND user_type_ LIKE '%STUDENT%'
-		GROUP BY organ_id_
-		ORDER BY organ_id_;
+			su.del_flag_ = '0' and su.tenant_id_ = #{tenantId}
+		GROUP BY su.organ_id_
+		ORDER BY su.organ_id_;
 	</select>
 
 	<select id="getStudentRegistrationData" resultMap="IndexBaseMonthData">
@@ -270,12 +267,10 @@
 			student stu
 			LEFT JOIN sys_user su ON stu.user_id_=su.id_
 		WHERE
-			su.del_flag_=0 and su.tenant_id_ = #{tenantId}
-		  AND su.organ_id_ IS NOT NULL
-		  AND su.user_type_ LIKE '%STUDENT%'
+			su.del_flag_='0' and su.tenant_id_ = #{tenantId}
 		  AND DATE_FORMAT(stu.create_time_, '%Y-%m-%d')&lt;=#{dayStr}
-		GROUP BY organ_id_
-		ORDER BY organ_id_;
+		GROUP BY su.organ_id_
+		ORDER BY su.organ_id_;
 	</select>
 
 	<select id="getAddStudentRegistrationData" resultMap="IndexBaseMonthData">
@@ -288,13 +283,10 @@
 		FROM
 			student stu
 			LEFT JOIN sys_user su ON stu.user_id_=su.id_
-		WHERE
-			su.del_flag_=0 and su.tenant_id_ = #{tenantId}
-		  AND su.organ_id_ IS NOT NULL
-		  AND su.user_type_ LIKE '%STUDENT%'
+		WHERE su.del_flag_='0' and su.tenant_id_ = #{tenantId}
 		  AND DATE_FORMAT(stu.create_time_, '%Y-%m-%d')=#{dayStr}
-		GROUP BY organ_id_
-		ORDER BY organ_id_;
+		GROUP BY su.organ_id_
+		ORDER BY su.organ_id_;
 	</select>
 
 	<select id="getChargeStudentChangeData" resultMap="IndexBaseMonthData">
@@ -309,12 +301,10 @@
 			LEFT JOIN sys_user su ON stu.user_id_=su.id_
 			LEFT JOIN student_payment_order spo ON stu.user_id_=spo.user_id_ AND status_='SUCCESS' AND actual_amount_>0
 		WHERE
-			su.del_flag_=0 and su.tenant_id_ = #{tenantId}
-			  AND su.organ_id_ IS NOT NULL
-			  AND su.user_type_ LIKE '%STUDENT%'
+			su.del_flag_='0' and su.tenant_id_ = #{tenantId}
 			  AND DATE_FORMAT(stu.create_time_, '%Y-%m-%d')&lt;=#{dayStr}
-		GROUP BY organ_id_
-		ORDER BY organ_id_;
+		GROUP BY su.organ_id_
+		ORDER BY su.organ_id_;
 	</select>
 
 	<select id="getHomeworkData" resultMap="IndexBaseMonthData">
@@ -341,7 +331,7 @@
 		FROM student_extracurricular_exercises_situation_ sees
 		LEFT JOIN sys_user su ON sees.student_id_=su.id_
 		LEFT JOIN teacher tea ON sees.teacher_id_=tea.id_
-		WHERE su.del_flag_=0 and su.tenant_id_ = #{tenantId}
+		WHERE su.del_flag_='0' and sees.tenant_id_ = #{tenantId}
 		  	AND tea.job_nature_='FULL_TIME'
 			AND su.organ_id_ IS NOT NULL
 			AND DATE_FORMAT(sees.monday_, '%Y-%m-%d')&lt;=#{dayStr}
@@ -434,7 +424,7 @@
 			teacher t
 			LEFT JOIN sys_user su ON su.id_ = t.id_
 		WHERE
-			su.del_flag_ = 0 and t.tenant_id_ = #{tenantId}
+			su.del_flag_ = '0' and t.tenant_id_ = #{tenantId}
 		  	AND (t.demission_date_ IS NULl OR DATE_FORMAT(t.demission_date_, '%Y-%m-%d') &gt; #{dayStr})
 		  	<if test="isDemission==null">
 				AND su.lock_flag_ = 0
@@ -470,7 +460,7 @@
 		  	AND m.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			AND (m.new_course_id_ IS NULL OR m.new_course_id_=m.id_)
 			AND NOT EXISTS (SELECT id_ FROM practice_group WHERE m.group_type_='PRACTICE' AND m.music_group_id_=id_ AND type_='TRIAL')
-			AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ = 0 and m.tenant_id_ = #{tenantId}
+			AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ != 1 and m.tenant_id_ = #{tenantId}
 			<if test="groupType!=null">
 				AND m.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
@@ -498,7 +488,7 @@
 			AND m.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			AND (m.new_course_id_ IS NULL OR m.new_course_id_=m.id_)
 			AND NOT EXISTS (SELECT id_ FROM practice_group WHERE m.group_type_='PRACTICE' AND m.music_group_id_=id_ AND type_='TRIAL')
-			AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ = 0
+			AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ != 1
 			<if test="groupType!=null">
 				AND m.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
@@ -523,7 +513,7 @@
 		AND (m.is_lock_ = 0 OR m.is_lock_ IS NULL)
 		AND (m.new_course_id_ IS NULL OR m.new_course_id_=m.id_)
 		AND NOT EXISTS (SELECT id_ FROM practice_group WHERE m.group_type_='PRACTICE' AND m.music_group_id_=id_ AND type_='TRIAL')
-		AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ = 0
+		AND m.organ_id_ IS NOT NULL AND m.pre_course_flag_ != 1
 		<if test="groupType!=null">
 			AND m.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 		</if>
@@ -653,7 +643,7 @@
 			LEFT JOIN course_schedule cs ON m.course_schedule_id_=cs.id_
 			LEFT JOIN practice_group pg ON m.music_group_id_=pg.id_ AND m.group_type_='PRACTICE'
 		WHERE
-			(cs.del_flag_ IS NULL OR cs.del_flag_=0)
+		cs.del_flag_ = '0'
 			AND cs.organ_id_ IS NOT NULL and cs.tenant_id_ = #{tenantId}
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
 			AND m.group_type_ IN ('VIP', 'PRACTICE')
@@ -749,8 +739,8 @@
 		LEFT JOIN course_schedule cs ON cs.class_group_id_=cg.id_
 		WHERE
 		cg.type_ IN ('HIGH', 'HIGH_ONLINE') and cg.tenant_id_ = #{tenantId}
-		AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0 AND cs.pre_course_flag_ = 0
-		AND cs.del_flag_=0
+		AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0 AND cs.pre_course_flag_ != 1
+		AND cs.del_flag_ = '0'
 		AND cs.status_='NOT_START'
 		AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
 		<if test="hasDesc != null and hasDesc == true">
@@ -784,9 +774,9 @@
 		LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
 		LEFT JOIN course_schedule cs ON cs.class_group_id_=cg.id_
 		WHERE
-		cg.type_ IN ('HIGH', 'HIGH_ONLINE') AND cs.pre_course_flag_ = 0 and cg.tenant_id_ = #{tenantId}
+		cg.type_ IN ('HIGH', 'HIGH_ONLINE') AND cs.pre_course_flag_ != 1 and cg.tenant_id_ = #{tenantId}
 		AND mg.status_ = 'PROGRESS' AND cg.del_flag_ = 0
-		AND cs.del_flag_=0
+		AND cs.del_flag_ = '0'
 		AND cs.status_='NOT_START'
 		AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
 		<if test="educationUserId != null">
@@ -948,8 +938,8 @@
 			LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND sa.user_id_ = cssp.user_id_
 			LEFT JOIN student_visit sv ON cssp.id_ = sv.object_id_
 		WHERE
-				cs.status_ = 'OVER' AND sv.id_ IS NULL AND cs.del_flag_ = 0 AND cs.class_date_ >= #{startTime} AND cs.class_date_ &lt;= DATE_FORMAT(NOW(),'%Y-%m-%d')
-				AND cssp.group_type_ IN ('MUSIC','PRACTICE','VIP') AND cs.pre_course_flag_ = 0 and cssp.tenant_id_ = #{tenantId}
+				cs.status_ = 'OVER' AND sv.id_ IS NULL AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime} AND cs.class_date_ &lt;= DATE_FORMAT(NOW(),'%Y-%m-%d')
+				AND cssp.group_type_ IN ('MUSIC','PRACTICE','VIP') AND cs.pre_course_flag_ != 1 and cssp.tenant_id_ = #{tenantId}
 			<if test="type!=null and type=='LEAVE'">
 				AND sa.status_ = 'LEAVE'
 			</if>
@@ -965,8 +955,8 @@
 	</select>
     <select id="getCourseTimeError" resultType="int">
 		SELECT COUNT(cs.id_) FROM course_schedule cs
-		WHERE cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND (cs.start_class_time_ &lt; #{courseStartTimeError} OR cs.end_class_time_ > #{courseEndTimeError})
-		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE cs.status_ = 'NOT_START' AND cs.del_flag_ = '0' AND cs.is_lock_ = 0 AND (cs.start_class_time_ &lt; #{courseStartTimeError} OR cs.end_class_time_ > #{courseEndTimeError})
+		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
 		<if test="classGroupIds != null and classGroupIds.size() > 0">
 			AND cs.class_group_id_ IN
 			<foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
@@ -986,8 +976,8 @@
 		       cs.organ_id_ AS 'key',
 		       COUNT(cs.id_) AS 'value'
 		FROM course_schedule cs
-		WHERE cs.status_ = 'NOT_START' AND cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.start_class_time_ &lt; '06:00:00'
-		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE cs.status_ = 'NOT_START' AND cs.del_flag_ = '0' AND cs.is_lock_ = 0 AND cs.start_class_time_ &lt; '06:00:00'
+		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
 		<if test="classGroupIds != null and classGroupIds.size() > 0">
 			AND cs.class_group_id_ IN
 			<foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
@@ -1007,8 +997,8 @@
 		SELECT COUNT(DISTINCT c.id_) FROM (SELECT cs.id_ FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
-		WHERE ta.teacher_id_ = cs.actual_teacher_id_ AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= #{startTime}
+		WHERE ta.teacher_id_ = cs.actual_teacher_id_ AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
+		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime}
 		AND ((ta.sign_in_status_ = 0 OR ta.sign_in_status_ IS NULL OR ta.sign_out_status_ = 0 OR ta.sign_out_status_ IS NULL)
 		         AND ta.complaints_content_ IS NULL AND ta.dispose_content_ IS NULL)
 		AND (ta.sign_out_status_ IS NOT NULL OR ta.sign_in_status_ IS NOT NULL)
@@ -1034,7 +1024,7 @@
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
-		WHERE cs.pre_course_flag_ = 0 AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= #{startTime}
+		WHERE cs.pre_course_flag_ != 1 AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime}
 		AND (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)) AND cssp.id_ IS NOT NULL
 		AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
@@ -1063,7 +1053,7 @@
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= #{startTime} AND cs.pre_course_flag_ = 0
+		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime} AND cs.pre_course_flag_ != 1
 		AND (((ta.sign_in_status_ = 0 OR ta.sign_in_status_ IS NULL OR ta.sign_out_status_ = 0 OR ta.sign_out_status_ IS NULL) AND ta.dispose_content_ IS NULL) OR (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)))
 		AND (ta.sign_out_status_ IS NOT NULL OR ta.sign_in_status_ IS NOT NULL)
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cssp.id_ IS NOT NULL
@@ -1087,7 +1077,7 @@
 		SELECT COUNT(DISTINCT cs.id_) FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>=#{startTime} AND cs.pre_course_flag_ = 0
+		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_>=#{startTime} AND cs.pre_course_flag_ != 1
 		AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.complaints_content_ IS NULL AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
 		AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
@@ -1112,7 +1102,7 @@
 		FROM course_schedule cs
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
-		AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>=#{startTime} AND cs.pre_course_flag_ = 0
+		AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_>=#{startTime} AND cs.pre_course_flag_ != 1
 		AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.dispose_content_ IS NULL
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
 		AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
@@ -1143,7 +1133,7 @@
 		SELECT COUNT(DISTINCT tcs.user_id_) FROM teacher_course_statistics tcs
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
 		LEFT JOIN sys_user su ON su.id_ = tcs.user_id_
-		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
+		WHERE su.lock_flag_ = 0 AND su.del_flag_ = '0' AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
 		AND t.is_settlement_salary_ = 1 and t.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
 		<if test="organIdsStr != null and organIdsStr != ''">
@@ -1158,7 +1148,7 @@
 		FROM teacher_course_statistics tcs
 		LEFT JOIN teacher t ON t.id_ = tcs.user_id_
 		LEFT JOIN sys_user su ON su.id_ = tcs.user_id_
-		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
+		WHERE su.lock_flag_ = 0 AND su.del_flag_ = '0' AND t.job_nature_ = 'FULL_TIME' AND t.demission_date_ IS NULL
 		AND t.is_settlement_salary_ = 1 and t.tenant_id_ = #{tenantId}
 		AND DATE_FORMAT(tcs.month_,'%Y-%m') = #{monthStr} AND tcs.low_salary = 1
 		<if test="organIdsStr != null and organIdsStr != ''">
@@ -1699,7 +1689,7 @@
 		SELECT COUNT(DISTINCT c.user_id_) FROM (
 		SELECT sa.user_id_ FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
-		WHERE cs.class_date_ BETWEEN #{firstDay} AND #{lastDay} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE cs.class_date_ BETWEEN #{firstDay} AND #{lastDay} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
 		<if test="organIdList != null and organIdList.size > 0">
 			AND cs.organ_id_ IN
 			<foreach collection="organIdList" open="(" close=")" item="item" separator=",">
@@ -1720,7 +1710,7 @@
 		SELECT c.organ_id_ 'key',COUNT(c.user_id_) 'value' FROM (
 		SELECT sa.user_id_,cs.organ_id_ FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= '2021-11' AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') >= '2021-11' AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
 		<if test="classGroupIds != null and classGroupIds.size() > 0">
 			AND cs.class_group_id_ IN
 			<foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
@@ -1742,7 +1732,7 @@
 		SELECT sa.user_id_ FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN sys_user su ON su.id_ = sa.user_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
 		<if test="organIds != null">
 			AND FIND_IN_SET(cs.organ_id_,#{organIds})
 		</if>
@@ -1777,7 +1767,7 @@
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = sa.user_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
 		<if test="organIds != null">
 			AND FIND_IN_SET(cs.organ_id_,#{organIds})
 		</if>
@@ -1805,7 +1795,7 @@
 	</select>
 	<sql id="queryStudentLeaveCourseListSql">
 		<where>
-			sa.user_id_ = #{userId} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+			sa.user_id_ = #{userId} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
 				AND (cs.id_ = #{search} OR cs.actual_teacher_id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%'))
 			</if>
@@ -1847,7 +1837,7 @@
 		FROM student_attendance sa
 		LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
 		LEFT JOIN sys_user su ON su.id_ = sa.user_id_
-		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') BETWEEN #{totalMonth} AND #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+		WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') BETWEEN #{totalMonth} AND #{currentMonth} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
 		<if test="organIds != null">
 			AND FIND_IN_SET(cs.organ_id_,#{organIds})
 		</if>
@@ -1881,7 +1871,7 @@
 				LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
 				LEFT JOIN sys_user su ON sr.user_id_ = su.id_
 			WHERE
-				su.del_flag_ = 0 and sr.tenant_id_ = #{tenantId}
+				su.del_flag_ = '0' and sr.tenant_id_ = #{tenantId}
 				AND mg.status_='PROGRESS'
 				AND sr.music_group_status_ = 'NORMAL'
 				<if test="dayStr!=null and dayStr!=''">
@@ -1899,7 +1889,7 @@
 			WHERE
 				cssp.group_type_ IN ( 'VIP', 'PRACTICE' ) and cssp.tenant_id_ = #{tenantId}
 				AND cs.status_ = 'NOT_START'
-				AND su.del_flag_ = 0
+				AND su.del_flag_ = '0'
 				<if test="dayStr!=null and dayStr!=''">
 					AND DATE(cssp.create_time_)&lt;= #{dayStr}
 				</if>)) t
@@ -1916,7 +1906,7 @@
 			COUNT(DISTINCT cto.student_id_) percent_
 		FROM cloud_teacher_order cto
 			LEFT JOIN sys_user su ON cto.student_id_=su.id_
-		WHERE su.del_flag_=0 AND cto.status_ IN (1,2) and cto.tenant_id_ = #{tenantId}
+		WHERE su.del_flag_='0' AND cto.status_ IN (1,2) and cto.tenant_id_ = #{tenantId}
 			<if test="dayStr!=null and dayStr!=''">
 				AND DATE(cto.create_time_)&lt;= #{dayStr}
 			</if>
@@ -1932,7 +1922,7 @@
 		COUNT(DISTINCT cto.student_id_) percent_
 		FROM cloud_teacher_order cto
 		LEFT JOIN sys_user su ON cto.student_id_=su.id_
-		WHERE su.del_flag_=0 AND cto.status_ IN (1,2) and cto.tenant_id_ = #{tenantId}
+		WHERE su.del_flag_='0' AND cto.status_ IN (1,2) and cto.tenant_id_ = #{tenantId}
 		<if test="dayStr!=null and dayStr!=''">
 			AND DATE(cto.create_time_)= #{dayStr}
 		</if>
@@ -1949,7 +1939,7 @@
 		FROM student stu
 		LEFT JOIN cloud_teacher_order cto ON stu.user_id_=cto.student_id_
 		LEFT JOIN sys_user su ON su.id_=stu.user_id_
-		WHERE su.del_flag_=0 AND stu.experience_member_rank_setting_id_ IS NOT NULL AND (cto.id_ IS NULL OR cto.status_ NOT IN (1, 2)) and cto.tenant_id_ = #{tenantId}
+		WHERE su.del_flag_='0' AND stu.experience_member_rank_setting_id_ IS NOT NULL AND (cto.id_ IS NULL OR cto.status_ NOT IN (1, 2)) and cto.tenant_id_ = #{tenantId}
 		<if test="dayStr!=null and dayStr!=''">
 			AND DATE(stu.experience_membership_start_time_)&lt;= #{dayStr}
 		</if>
@@ -1964,9 +1954,9 @@
 			COUNT(DISTINCT smcr.user_id_) activate_num_,
 			COUNT(DISTINCT smcr.user_id_) percent_
 		FROM sys_music_compare_record smcr
-			LEFT JOIN sys_user su ON smcr.user_id_=su.id_
-			LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-		WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL and smcr.tenant_id_ = #{tenantId}
+		LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
+		LEFT JOIN sys_user su ON stu.user_id_=su.id_
+		WHERE su.del_flag_='0' AND smcr.user_id_ = stu.user_id_ and smcr.tenant_id_ = #{tenantId}
 			<if test="dayStr!=null and dayStr!=''">
 				AND DATE(smcr.create_time_)= #{dayStr}
 			</if>
@@ -1981,17 +1971,16 @@
 			COUNT(user_id_) activate_num_,
 			COUNT(user_id_) percent_
 		FROM (SELECT
-			su.organ_id_,su.tenant_id_,
-			smcr.user_id_,
-			COUNT(DISTINCT(CASE WHEN DATEDIFF(NOW(), smcr.create_time_)&lt;=15 THEN DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') ELSE NULL END)) days
-			FROM sys_music_compare_record smcr
-			LEFT JOIN sys_user su ON smcr.user_id_=su.id_
-			LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-			WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL and smcr.tenant_id_ = #{tenantId}
-			<if test="dayStr!=null and dayStr!=''">
-				AND DATE(smcr.create_time_) &lt;= #{dayStr}
-			</if>
-			GROUP BY smcr.user_id_) t WHERE t.days>=5
+			  SELECT su.organ_id_, su.tenant_id_, smcr.user_id_
+					  , COUNT(DISTINCT DATE_FORMAT(smcr.create_time_, '%Y-%m-%d')) AS days
+			  FROM sys_music_compare_record smcr
+				  LEFT JOIN student stu ON smcr.user_id_ = stu.user_id_
+				  LEFT JOIN sys_user su ON stu.user_id_ = su.id_
+			  WHERE su.del_flag_ = '0' AND smcr.user_id_ = stu.user_id_
+				AND smcr.tenant_id_ = #{tenantId}
+				AND smcr.create_time_ >= CURDATE() - INTERVAL 15 DAY
+			  GROUP BY smcr.user_id_
+			) t WHERE t.days>=5
 		GROUP BY t.organ_id_
 	</select>
 
@@ -2007,7 +1996,7 @@
 		SELECT su.organ_id_, smcr.tenant_id_, smcr.user_id_
 		FROM sys_music_compare_record smcr
 		INNER JOIN sys_user su ON smcr.user_id_ = su.id_
-		WHERE su.del_flag_ = 0 AND smcr.tenant_id_ = 3
+		WHERE su.del_flag_ = '0' AND smcr.tenant_id_ = #{tenantId}
 		AND smcr.create_time_ >= #{dayStr}
 		AND smcr.create_time_ &lt; DATE_ADD(#{dayStr}, INTERVAL 1 DAY)
 		GROUP BY smcr.user_id_) t

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

@@ -228,7 +228,7 @@
 			LEFT JOIN vip_group vg ON cs.music_group_id_=vg.id_ AND cs.group_type_='VIP'
 			LEFT JOIN practice_group pg ON cs.music_group_id_=pg.id_ AND cs.group_type_='PRACTICE'
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_
-			AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= '2021-02-01'
+			AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= '2021-02-01'
 			AND (((ta.sign_in_status_ = 0 OR ta.sign_in_status_ IS NULL OR ta.sign_out_status_ = 0 OR ta.sign_out_status_ IS NULL) AND ta.dispose_content_ IS NULL) OR (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)))
 			AND (ta.sign_out_status_ IS NOT NULL OR ta.sign_in_status_ IS NOT NULL)
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) AND cssp.id_ IS NOT NULL
@@ -256,7 +256,7 @@
 			LEFT JOIN vip_group vg ON cs.music_group_id_=vg.id_ AND cs.group_type_='VIP'
 			LEFT JOIN practice_group pg ON cs.music_group_id_=pg.id_ AND cs.group_type_='PRACTICE'
 		WHERE ta.teacher_id_ = cs.actual_teacher_id_
-			AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_>='2021-02-01'
+			AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_>='2021-02-01'
 			AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.dispose_content_ IS NULL
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
 			AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)

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

@@ -105,7 +105,7 @@
         LEFT JOIN course_schedule cs ON iipc.course_schedule_id_ = cs.id_
         LEFT JOIN class_group cg ON cg.id_=cs.class_group_id_
         LEFT JOIN sys_user su on su.id_ = iipc.teacher_id_
-        WHERE iipc.plan_id_=#{planId} AND cs.pre_course_flag_ = 0
+        WHERE iipc.plan_id_=#{planId} AND cs.pre_course_flag_ != 1
         <if test="checkItem != null">
             AND iipc.check_item_ = #{checkItem}
         </if>

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

@@ -71,7 +71,7 @@
     <if test="param.endTime != null">
         AND cs.class_date_ &lt;= date_format(#{param.endTime},'%Y-%m-%d')
     </if>
-    AND csts.user_id_ = #{param.teacherId} AND cs.pre_course_flag_ = 0
+    AND csts.user_id_ = #{param.teacherId} AND cs.pre_course_flag_ != 1
     <if test="param.status != null">
         <if test="param.status == 'UNDERWAY'">
             AND (cs.status_  = 'UNDERWAY'

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

@@ -532,8 +532,8 @@
         left join class_group cg on cs.class_group_id_ = cg.id_
         left join music_group mg on cg.music_group_id_ = mg.id_
         where cs.group_type_ = 'MUSIC' AND cg.group_type_ = 'MUSIC' and cs.tenant_id_ = #{tenantId}
-        and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_
-        is null) and mg.organ_id_ not in (36,38) AND cs.pre_course_flag_ = 0
+        and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and cs.del_flag_ = '0'
+        and mg.organ_id_ not in (36,38) AND cs.pre_course_flag_ != 1
         <if test="organId != null">
             AND FIND_IN_SET(mg.organ_id_,#{organId})
         </if>
@@ -747,7 +747,7 @@
         FROM course_schedule cs
                      LEFT JOIN music_group mg ON mg.id_ = cs.music_group_id_
         WHERE cs.actual_teacher_id_ = #{teacherId}
-          AND cs.group_type_ = 'MUSIC' AND cs.pre_course_flag_ = 0
+          AND cs.group_type_ = 'MUSIC' AND cs.pre_course_flag_ != 1
         GROUP BY mg.id_
     </select>
     <select id="queryUserMusicInfos" resultMap="queryUserMusicGroupsMap">

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

@@ -126,7 +126,7 @@
 		SELECT c.class_group_id_,c.type_,c.course_num_ - (CASE WHEN t.course_num_ IS NULL THEN 0 ELSE t.course_num_ END) num_,c.name_ FROM (
 		SELECT cs.class_group_id_,cs.type_,COUNT(cs.id_) course_num_,cg.name_ FROM course_schedule cs
 		LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
-		WHERE cs.music_group_id_ = #{dto.musicGroupId} AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+		WHERE cs.music_group_id_ = #{dto.musicGroupId} AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND cs.is_lock_ = 0
 		<if test="dto.startSchoolTerm != null">
 			AND cs.class_date_ >= DATE_FORMAT(#{dto.startSchoolTerm}, '%Y%m%d')
 		</if>
@@ -159,7 +159,7 @@
 		GROUP BY tp.class_group_id_,tp.course_type_) t
 		LEFT JOIN (
 		SELECT cs.class_group_id_,cs.type_,COUNT(cs.id_) course_num_,'' name_ FROM course_schedule cs
-		WHERE cs.music_group_id_ = #{dto.musicGroupId} AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
+		WHERE cs.music_group_id_ = #{dto.musicGroupId} AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND cs.is_lock_ = 0
 		<if test="dto.startSchoolTerm != null">
 			AND cs.class_date_ >= DATE_FORMAT(#{dto.startSchoolTerm}, '%Y%m%d')
 		</if>

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

@@ -190,7 +190,7 @@
 	<select id="sumCourseAmount" resultType="java.util.Map">
 		SELECT cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' FROM course_schedule cs
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
-		where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
+		where cs.del_flag_ = '0' AND cs.is_lock_ = 0 AND cs.pre_course_flag_ != 1 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
 		AND cssp.actual_price_ > 0 AND cs.class_date_ BETWEEN #{firstDay} AND #{lastDay}
 		AND DATE_FORMAT(cs.create_time_,'%Y') = #{currentYear} AND cs.settlement_report_flag_ = 0 group by cs.organ_id_;
 	</select>
@@ -242,7 +242,7 @@
 	<select id="sumCoursePreAmount" resultType="java.util.Map">
 		SELECT cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' FROM course_schedule cs
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
-		where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0
+		where cs.del_flag_ = '0' AND cs.is_lock_ = 0 AND cs.pre_course_flag_ != 1
 		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND cs.class_date_ > #{lastDay}
 		AND cs.group_type_ != 'MUSIC'
 		group by cs.organ_id_;

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

@@ -589,7 +589,7 @@
             sys_user su
         WHERE
             su.tenant_id_ = #{tenantId}
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
 			AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIdList!=null">
                 AND su.organ_id_ IN
@@ -610,7 +610,7 @@
             sys_user su
         WHERE
             su.tenant_id_ = #{tenantId}
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
 			AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIdList!=null">
             AND su.organ_id_ IN
@@ -628,7 +628,7 @@
           LEFT JOIN sys_user su ON t.id_=su.id_
         WHERE
             FIND_IN_SET(#{subjectId}, t.subject_id_)
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
             AND t.is_support_extra_practice_lesson_=1
             AND (t.organ_id_ = #{studentOrganId} OR FIND_IN_SET(#{studentOrganId},t.flow_organ_range_))
             AND NOT EXISTS (SELECT

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

@@ -289,7 +289,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="studentID != null">
                 and sa.user_id_ = #{studentID}
             </if>
@@ -352,7 +352,7 @@
             student_attendance sa
             LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
             WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
             AND sa.class_group_id_=#{classGroupId}
             AND sa.user_id_ IN
             <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
@@ -499,7 +499,7 @@
     </select>
     <sql id="findStudentAttendanceSql">
         <where>
-            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND cs.is_lock_ = 0 and cs.tenant_id_ = #{tenantId}
             <if test="visitFlag != null">
                 <if test="visitFlag == 1">
                     AND sa.visit_flag_ = 1
@@ -611,7 +611,7 @@
     </select>
     <sql id="exportStudentAttendancesQueryPageSql">
         <where>
-                cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+                cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(cs.organ_id_,#{organId})
             </if>
@@ -664,7 +664,7 @@
     <select id="getLeaveNum" resultType="java.lang.Integer">
         SELECT COUNT(sa.id_) FROM student_attendance sa
         LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
-        WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND sa.user_id_ = #{userId} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ = 0
+        WHERE DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND sa.user_id_ = #{userId} AND sa.status_ = 'LEAVE' AND cs.pre_course_flag_ != 1
         <if test="attendanceId != null">
             AND sa.id_ != #{attendanceId}
         </if>
@@ -672,7 +672,7 @@
     <select id="queryLeaveNum" resultType="java.util.Map">
         SELECT sa.user_id_ 'key',COUNT(sa.id_) 'value' FROM student_attendance sa
         LEFT JOIN course_schedule cs ON cs.id_ = sa.course_schedule_id_
-        WHERE sa.status_ = 'LEAVE' AND DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.pre_course_flag_ = 0
+        WHERE sa.status_ = 'LEAVE' AND DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.pre_course_flag_ != 1
         AND sa.user_id_ IN
         <foreach collection="userIds" item="userId" separator="," open="(" close=")">
             #{userId}

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

@@ -180,7 +180,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="createTime != null">
                 AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
             </if>
@@ -395,7 +395,7 @@
         LEFT JOIN course_homework ch ON ch.id_ = sch.course_homework_id_
         LEFT JOIN course_schedule cs ON cs.id_ = sch.course_schedule_id_
         LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
-        WHERE sch.user_id_=#{userId} AND cs.pre_course_flag_ = 0
+        WHERE sch.user_id_=#{userId} AND cs.pre_course_flag_ != 1
         AND DATE_FORMAT(class_date_, '%Y-%m')=DATE_FORMAT(#{classDate}, '%Y-%m')
         <if test="finishStatus != null">
             <if test="finishStatus == true">

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

@@ -961,7 +961,7 @@
         LEFT JOIN student_basic_info sbi ON sbi.user_id_ = sees.student_id_
         LEFT JOIN music_group mg ON mg.id_ = sees.music_group_id_
         LEFT JOIN course_schedule_student_payment cssp ON cssp.music_group_id_ = sees.music_group_id_ AND cssp.user_id_ = sees.student_id_ AND cssp.group_type_ = 'MUSIC'
-        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+        LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_ AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         AND cs.is_lock_ = 0 AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ ) AND cs.class_date_ BETWEEN #{monday} AND #{sunday}
         LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.user_id_ = cssp.user_id_ AND sa.status_ IN ('NORMAL','LATE')
         WHERE sees.monday_ >= #{monday} AND sees.sunday_ <= #{sunday}

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

@@ -171,7 +171,7 @@
     </select>
     <sql id="findStudentsByOrganIdSql">
         <where>
-                su.del_flag_ = 0 and s.tenant_id_ = #{tenantId}
+                su.del_flag_ = '0' and s.tenant_id_ = #{tenantId}
             <if test="organIds != null and organIds.length>0">
                 AND su.organ_id_ IN
                 <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -301,7 +301,7 @@
 
     <sql id="studentManageCourseQueryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
             AND cgsm.status_ != 'QUIT' and cg.tenant_id_ = #{tenantId}
             <if test="studentId!=null">
                 and cgsm.user_id_ = #{studentId}
@@ -355,7 +355,7 @@
 
     <sql id="studentManageAttendanceQueryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cssp.tenant_id_ = #{tenantId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cssp.tenant_id_ = #{tenantId}
             <if test="studentId!=null">
                 AND cssp.user_id_ = #{studentId}
             </if>
@@ -456,7 +456,7 @@
     </select>
     <sql id="studentPaymentSql">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and cssp.tenant_id_ = #{tenantId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and cssp.tenant_id_ = #{tenantId}
             AND cs.id_ IS NOT NULL AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
             <if test="classGroupType != null">
                 AND cs.type_ = #{classGroupType}
@@ -654,7 +654,7 @@
 
     <sql id="queryMusicGroupStudentsSignSql">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ = 0 and sa.tenant_id_ = #{tenantId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1 and sa.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 AND sa.music_group_id_ = #{musicGroupId}
             </if>
@@ -771,7 +771,7 @@
         LEFT JOIN course_schedule_student_payment cssp1 ON su.id_ = cssp1.user_id_ AND cssp1.group_type_ = 'PRACTICE'
         LEFT JOIN class_group_student_mapper cgsm ON su.id_ = cgsm.user_id_ AND cgsm.group_type_ = 'VIP'
         LEFT JOIN sys_user_cash_account suca ON su.id_ = suca.user_id_
-        WHERE su.user_type_ LIKE '%STUDENT%' AND cs.pre_course_flag_ = 0 and su.tenant_id_ = #{tenantId}
+        WHERE su.user_type_ LIKE '%STUDENT%' AND cs.pre_course_flag_ != 1 and su.tenant_id_ = #{tenantId}
         <if test="hasPracticeCourse != null and hasPracticeCourse == true">
             AND cssp1.id_ IS NOT NULL
         </if>
@@ -824,7 +824,7 @@
     </select>
     <select id="getIsActive" resultType="java.util.Map">
         SELECT su.id_ 'key',COUNT(su.id_) 'value' FROM sys_user su
-        WHERE su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0 AND su.password_ IS NULL AND su.id_ IN
+        WHERE su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = '0' AND su.password_ IS NULL AND su.id_ IN
         <foreach collection="userIds" separator="," open="(" close=")" item="item">
             #{item}
         </foreach>
@@ -869,7 +869,7 @@
         SELECT su.id_ 'key',COUNT(DISTINCT su.id_) 'value' FROM sys_user su
         LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = su.id_
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-        WHERE cs.status_ != 'OVER' AND cs.pre_course_flag_ = 0 AND su.id_ IN
+        WHERE cs.status_ != 'OVER' AND cs.pre_course_flag_ != 1 AND su.id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}
         </foreach>

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

@@ -245,7 +245,7 @@
     </select>
     <sql id="queryPageSql">
         <where>
-        	s.tenant_id_ = #{tenantId} and su.del_flag_ = 0
+        	s.tenant_id_ = #{tenantId} and su.del_flag_ = '0'
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(su.organ_id_,#{organId})
             </if>
@@ -393,7 +393,7 @@
         SELECT user_id_
         FROM student stu
           LEFT JOIN sys_user su ON stu.user_id_=su.id_
-        WHERE service_tag_=1 AND su.del_flag_=0
+        WHERE service_tag_=1 AND su.del_flag_='0'
         and stu.tenant_id_ = #{tenantId}
     </select>
     <select id="getServeStudentCourseStartTimes" resultType="com.ym.mec.biz.dal.dto.StudentServeCourseDto">
@@ -436,7 +436,7 @@
         FROM course_schedule_student_payment cssp
             LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
         WHERE cssp.tenant_id_ = #{tenantId}
-            AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+            AND cs.del_flag_ = '0'
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
             AND cs.class_date_ between #{monday} and #{sunday}
             AND cs.type_ IN ('SINGLE', 'TRAINING_SINGLE', 'MIX', 'TRAINING_MIX')
@@ -462,7 +462,7 @@
             sys_user su
         WHERE
             su.tenant_id_ = #{tenantId}
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
             AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIds!=null">
                 AND su.organ_id_ IN
@@ -484,7 +484,7 @@
             sys_user su
         WHERE
             su.tenant_id_ = #{tenantId}
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
             AND FIND_IN_SET('STUDENT',su.user_type_)
             <if test="organIds!=null">
                 AND su.organ_id_ IN
@@ -583,7 +583,7 @@
                FROM student_registration sr
                         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
                         LEFT JOIN sys_user su ON sr.user_id_=su.id_
-               WHERE su.del_flag_=0
+               WHERE su.del_flag_='0'
                  AND mg.status_='PROGRESS'
                  AND sr.music_group_status_='NORMAL'
                  AND su.organ_id_ = #{organId})
@@ -597,7 +597,7 @@
                WHERE
                    cssp.group_type_ IN ('VIP', 'PRACTICE')
                  AND cs.status_='NOT_START'
-                 AND su.del_flag_ = 0
+                 AND su.del_flag_ = '0'
                  AND su.organ_id_ = #{organId})) t
         WHERE t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
     </select>
@@ -636,7 +636,7 @@
         cssp.group_type_ IN ('VIP', 'PRACTICE')
         AND cs.status_='NOT_START')) t
         LEFT JOIN sys_user su ON t.user_id_=su.id_
-        WHERE su.del_flag_=0 AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
+        WHERE su.del_flag_='0' AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
            AND su.organ_id_ IN
            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                #{organId}
@@ -650,7 +650,7 @@
         FROM sys_music_compare_record smcr
              LEFT JOIN sys_user su ON smcr.user_id_=su.id_
              LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-        WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL AND su.organ_id_=#{organId};
+        WHERE su.del_flag_='0' AND stu.user_id_ IS NOT NULL AND su.organ_id_=#{organId};
     </select>
 
     <select id="getOrgansTotalCloudStudyStudentNum" resultType="int">
@@ -659,7 +659,7 @@
         FROM sys_music_compare_record smcr
                  LEFT JOIN sys_user su ON smcr.user_id_=su.id_
                  LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-        WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
+        WHERE su.del_flag_='0' AND stu.user_id_ IS NOT NULL
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
@@ -701,7 +701,7 @@
         FROM sys_music_compare_record smcr
                  LEFT JOIN sys_user su ON smcr.user_id_=su.id_
                  LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-        WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
+        WHERE su.del_flag_='0' AND stu.user_id_ IS NOT NULL
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
@@ -717,7 +717,7 @@
             FROM sys_music_compare_record smcr
             LEFT JOIN sys_user su ON smcr.user_id_=su.id_
             LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-            WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL AND su.organ_id_=#{organId}
+            WHERE su.del_flag_='0' AND stu.user_id_ IS NOT NULL AND su.organ_id_=#{organId}
             GROUP BY smcr.user_id_) t WHERE t.days>=5
     </select>
 
@@ -780,7 +780,7 @@
               FROM sys_music_compare_record smcr
                        LEFT JOIN sys_user su ON smcr.user_id_=su.id_
                        LEFT JOIN student stu ON smcr.user_id_=stu.user_id_
-              WHERE su.del_flag_=0 AND stu.user_id_ IS NOT NULL
+              WHERE su.del_flag_='0' AND stu.user_id_ IS NOT NULL
                     AND su.organ_id_ IN
                     <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                         #{organId}
@@ -791,7 +791,7 @@
 
     <sql id="queryCloudStudyStudentDataCondition">
         <where>
-            su.del_flag_=0 AND t.user_id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29') and su.tenant_id_ = #{tenantId}
+            su.del_flag_='0' AND stu.subject_id_list_ NOT IN ('21','25','26','27','28','29') and su.tenant_id_ = #{tenantId}
             <if test="organId!=null">
                 AND su.organ_id_=#{organId}
             </if>
@@ -806,7 +806,7 @@
             stu.user_id_ studentId,
             su.organ_id_ organId,
             su.username_ studentName,
-            sub.name_	subjectName,
+            stu.subject_id_list_ subjectId,
             stu.cloud_study_sequence_days_ cloudStudyRunningDays,
             COUNT(DISTINCT smcr.behavior_id_) cloudStudyUseNum,
             SUM(CASE WHEN smcr.play_time_ IS NULL THEN 0 ELSE play_time_ END) cloudStudyUseTime,
@@ -821,8 +821,8 @@
                 student_registration sr
                 LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
                 WHERE
-                mg.status_ = 'PROGRESS'
-                AND sr.music_group_status_ = 'NORMAL'
+                mg.status_ = 'PROGRESS' and sr.tenant_id_ = #{tenantId}
+        AND sr.music_group_status_ = 'NORMAL'
                 ) UNION ALL
                 (
                 SELECT
@@ -831,12 +831,11 @@
                 course_schedule_student_payment cssp
                 LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
                 WHERE
-                cssp.group_type_ IN ( 'VIP', 'PRACTICE' )
+                cssp.group_type_ IN ( 'VIP', 'PRACTICE' ) and cssp.tenant_id_ = #{tenantId}
                 AND cs.status_ = 'NOT_START'
                 )) t1) t
             LEFT JOIN student stu ON t.user_id_=stu.user_id_
             LEFT JOIN sys_user su ON stu.user_id_=su.id_
-            LEFT JOIN `subject` sub ON stu.subject_id_list_ = sub.id_
             LEFT JOIN sys_music_compare_record smcr ON stu.user_id_ = smcr.user_id_
             <if test="cloudTeacherTrainStartDate != null">
                 AND date(smcr.create_time_) &gt;= #{cloudTeacherTrainStartDate}
@@ -870,7 +869,7 @@
         student_registration sr
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         WHERE
-        mg.status_ = 'PROGRESS'
+        mg.status_ = 'PROGRESS' and sr.tenant_id_ = #{tenantId}
         AND sr.music_group_status_ = 'NORMAL'
         ) UNION ALL
         (
@@ -880,9 +879,10 @@
         course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
         WHERE
-        cssp.group_type_ IN ( 'VIP', 'PRACTICE' )
+        cssp.group_type_ IN ( 'VIP', 'PRACTICE' ) and cssp.tenant_id_ = #{tenantId}
         AND cs.status_ = 'NOT_START'
         )) t
+        LEFT JOIN student stu ON t.user_id_=stu.user_id_
         LEFT JOIN sys_user su ON t.user_id_ = su.id_
         LEFT JOIN sys_music_compare_record smcr ON t.user_id_ = smcr.user_id_
         <if test="cloudTeacherTrainStartDate != null">
@@ -899,7 +899,7 @@
         FROM student stu
              LEFT JOIN cloud_teacher_order cto ON stu.user_id_=cto.student_id_
              LEFT JOIN sys_user su ON su.id_=stu.user_id_
-        WHERE su.del_flag_=0 AND su.organ_id_=#{organId} AND stu.experience_member_rank_setting_id_ IS NOT NULL
+        WHERE su.del_flag_='0' AND su.organ_id_=#{organId} AND stu.experience_member_rank_setting_id_ IS NOT NULL
           AND NOT EXISTS (SELECT student_id_ FROM cloud_teacher_order WHERE student_id_=stu.user_id_ AND status_ IN (1,2))
     </select>
 
@@ -908,7 +908,7 @@
         FROM student stu
                  LEFT JOIN cloud_teacher_order cto ON stu.user_id_=cto.student_id_
                  LEFT JOIN sys_user su ON su.id_=stu.user_id_
-        WHERE su.del_flag_=0 AND stu.experience_member_rank_setting_id_ IS NOT NULL AND (cto.id_ IS NULL OR cto.status_ NOT IN (1, 2))
+        WHERE su.del_flag_='0' AND stu.experience_member_rank_setting_id_ IS NOT NULL AND (cto.id_ IS NULL OR cto.status_ NOT IN (1, 2))
             AND su.organ_id_ IN
             <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                 #{organId}
@@ -1061,7 +1061,7 @@
         -- 新用户
         WHERE su.id_ NOT IN (SELECT DISTINCT(sr.`user_id_`) FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        LEFT JOIN course_schedule cs on cs.`music_group_id_` = mg.`id_` AND cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND cs.del_flag_ = 0
+        LEFT JOIN course_schedule cs on cs.`music_group_id_` = mg.`id_` AND cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND cs.del_flag_ = '0'
         LEFT JOIN `course_schedule_student_payment` cssp on cssp.`course_schedule_id_` = cs.`id_` AND sr.user_id_ = cssp.user_id_
         WHERE mg.`status_` = 'PROGRESS' AND sr.music_group_status_ = 'NORMAL'
         GROUP BY sr.`user_id_` HAVING COUNT(cssp.`id_`) &lt;= 4)
@@ -1342,7 +1342,7 @@
     <select id="queryExistStuByPhone" resultType="java.lang.String">
         select su.phone_ from student s
         left join sys_user su ON su.id_ = s.user_id_
-        where su.del_flag_ = 0 AND su.tenant_id_ = 1 AND su.phone_ IN
+        where su.del_flag_ = '0' AND su.tenant_id_ = 1 AND su.phone_ IN
         <foreach collection="phones" item="phone" separator="," open="(" close=")">
             #{phone}
         </foreach>
@@ -1350,7 +1350,7 @@
     </select>
     <sql id="queryStudentBasicInfoSql">
         <where>
-            AND su.lock_flag_ = 0 AND su.del_flag_ = 0
+            AND su.lock_flag_ = 0 AND su.del_flag_ = '0'
             <if test="search != null and search != ''">
                 AND (s.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
             </if>

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

@@ -152,7 +152,7 @@
         FROM sys_user su
         LEFT JOIN student s ON su.id_=s.user_id_
         WHERE FIND_IN_SET(su.organ_id_,#{organIdList})
-        AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
+        AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = '0'
         <if test="search">
             AND (su.username_ LIKE CONCAT(#{search},'%') OR su.phone_ LIKE CONCAT(#{search},'%'))
         </if>
@@ -167,7 +167,7 @@
         <if test="repairFlag != null">
             LEFT JOIN student s ON su.id_=s.user_id_
         </if>
-        WHERE FIND_IN_SET(su.organ_id_,#{organIdList}) AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = 0
+        WHERE FIND_IN_SET(su.organ_id_,#{organIdList}) AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = '0'
         <if test="search">
             AND (su.username_ LIKE CONCAT(#{search},'%') OR su.phone_ LIKE CONCAT(#{search},'%'))
         </if>

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

@@ -95,7 +95,7 @@
 		FROM sys_employee_position sep
 		LEFT JOIN sys_user su ON su.id_ = sep.user_id_
 		LEFT JOIN employee e ON e.user_id_ = su.id_
-		WHERE su.lock_flag_ = 0 AND su.del_flag_ = 0 AND sep.tenant_id_ = #{tenantId}
+		WHERE su.lock_flag_ = 0 AND su.del_flag_ = '0' AND sep.tenant_id_ = #{tenantId}
 		<if test="organIds!=null and organIds!=''">
 			AND INTE_ARRAY(e.organ_id_list_,#{organIds})
 		</if>

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

@@ -379,7 +379,7 @@
 					sys_music_compare_record smcr
 						LEFT JOIN sys_user su ON smcr.user_id_ = su.id_
 				WHERE
-					su.del_flag_ = 0
+					su.del_flag_ = '0'
 					AND su.organ_id_ = #{organId}
 				GROUP BY
 					user_id_
@@ -401,7 +401,7 @@
 					sys_music_compare_record smcr
 						LEFT JOIN sys_user su ON smcr.user_id_ = su.id_
 				WHERE
-					su.del_flag_ = 0
+					su.del_flag_ = '0'
 					<if test="organIds!=null and organIds.size()>0">
 						AND su.organ_id_ IN
 						<foreach collection="organIds" item="organId" open="(" close=")" separator=",">
@@ -428,7 +428,7 @@
 					sys_music_compare_record smcr
 						LEFT JOIN sys_user su ON smcr.user_id_ = su.id_
 				WHERE
-					su.del_flag_ = 0
+					su.del_flag_ = '0'
 					<if test="organIds!=null and organIds.size()>0">
 						AND su.organ_id_ IN
 						<foreach collection="organIds" item="organId" open="(" close=")" separator=",">

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

@@ -258,7 +258,7 @@
 
     <sql id="queryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.actual_teacher_id_ = ta.teacher_id_ AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.actual_teacher_id_ = ta.teacher_id_ AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             <if test="teacherId != null">
                 AND cs.actual_teacher_id_ = #{teacherId}
             </if>
@@ -290,7 +290,7 @@
     </sql>
     <sql id="queryTeacherAttendancesCondition">
         <where>
-            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
             <if test="search != null and search != ''">
                 AND (su.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%'))
@@ -473,7 +473,7 @@
         WHERE ta.sign_out_status_ IS NULL and cs.tenant_id_ = #{tenantId}
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
         AND CONCAT( cs.class_date_, ' ', cs.end_class_time_ ) &lt;= DATE_SUB(now(),INTERVAL #{minutes} MINUTE)
-        AND cs.class_date_ = DATE_FORMAT(NOW(),'%Y-%m-%d') AND cs.del_flag_ = 0
+        AND cs.class_date_ = DATE_FORMAT(NOW(),'%Y-%m-%d') AND cs.del_flag_ = '0'
         AND cs.group_type_ = 'MUSIC'
     </select>
     <select id="findTeacherIdByCourseSchedule" resultMap="TeacherAttendance">
@@ -530,7 +530,7 @@
     <select id="queryTeacherExceptionAttendance" resultType="java.lang.Integer">
         SELECT DISTINCT ta.teacher_id_ FROM teacher_attendance ta
         LEFT JOIN course_schedule cs ON cs.id_ = ta.course_schedule_id_
-        WHERE cs.del_flag_ = 0 AND cs.class_date_ = #{format}
+        WHERE cs.del_flag_ = '0' AND cs.class_date_ = #{format}
         AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
         AND ta.teacher_id_ = cs.actual_teacher_id_ AND CONCAT(cs.class_date_,' ',cs.end_class_time_) &lt; NOW()
         AND (ta.sign_in_status_ IS NULL OR ta.sign_in_status_ = 0 OR ta.sign_out_status_ IS NULL OR ta.sign_out_status_ = 0)
@@ -638,7 +638,7 @@
 
     <sql id="queryTeacherAttendanceSql">
         <where>
-            cs.group_type_ = 'MUSIC' AND cs.is_lock_ = 0 AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+            cs.group_type_ = 'MUSIC' AND cs.is_lock_ = 0 AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
             AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
             <if test="queryInfo.startTerm != null and queryInfo.startTerm != ''">
@@ -699,7 +699,7 @@
         <if test="query.courseType != null and query.courseType != ''">
             AND cs.type_ = #{query.courseType}
         </if>
-        AND cs.is_lock_ = 0 AND cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
+        AND cs.is_lock_ = 0 AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
     </select>
     <update id="cleanCourseTeacherSignInfo">
         UPDATE teacher_attendance

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

@@ -97,7 +97,7 @@
                 ROUND( AVG( TIMESTAMPDIFF( MINUTE, start_class_time_, end_class_time_ )), 0 ) average_class_minutes_
             FROM course_schedule_teacher_salary csts
                      LEFT JOIN course_schedule cs ON cs.id_=csts.course_schedule_id_
-            WHERE cs.del_flag_ != 1 AND cs.pre_course_flag_ = 0
+            WHERE cs.del_flag_ != 1 AND cs.pre_course_flag_ != 1
               AND cs.class_date_ >= #{startDate} AND cs.class_date_ <= #{endDate}
               AND csts.group_type_ IN ( 'VIP', 'MUSIC', 'PRACTICE' )
             GROUP BY
@@ -116,7 +116,7 @@
             #{userId}
         </foreach>
         <![CDATA[AND cs.class_date_ >= #{startDate} AND cs.class_date_ <= #{endDate}
-        AND csts.group_type_ IN ('VIP', 'MUSIC', 'PRACTICE') AND cs.del_flag_ != 1 AND cs.pre_course_flag_ = 0
+        AND csts.group_type_ IN ('VIP', 'MUSIC', 'PRACTICE') AND cs.del_flag_ != 1 AND cs.pre_course_flag_ != 1
         GROUP BY csts.user_id_, csts.group_type_;
   ]]></select>
 

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

@@ -128,7 +128,7 @@
         t.is_settlement_salary_,su.tenant_id_, t.courseware_limit_
         FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
-        WHERE t.id_ = #{id} AND su.del_flag_ = 0
+        WHERE t.id_ = #{id} AND su.del_flag_ = '0'
     </select>
 
     <!-- 全查询 -->
@@ -423,7 +423,7 @@
 
     <sql id="queryPageMap">
         <where>
-            su.del_flag_ = 0 and t.tenant_id_ = #{tenantId}
+            su.del_flag_ = '0' and t.tenant_id_ = #{tenantId}
             <if test="organId != null and organId != ''">
                AND (CONCAT(',',t.organ_id_,',',IFNULL(t.flow_organ_range_,''),',') REGEXP CONCAT(',(',replace(#{organId},',','|'),'),'))
             </if>
@@ -582,7 +582,7 @@
         WHERE
             FIND_IN_SET(#{subjectId},t.subject_id_)
             AND (t.organ_id_=#{organId} OR FIND_IN_SET(#{organId},t.flow_organ_range_))
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
             AND t.is_support_extra_practice_lesson_=1
             AND t.organ_id_!=36
     </select>
@@ -599,7 +599,7 @@
         WHERE
             FIND_IN_SET(#{subjectId},t.subject_id_)
             AND (t.organ_id_=#{organId} OR FIND_IN_SET(#{organId},t.flow_organ_range_))
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
             AND t.is_support_extra_practice_lesson_=1
             AND t.organ_id_!=36
     </select>
@@ -621,7 +621,7 @@
         WHERE
             FIND_IN_SET(#{subjectId},t.subject_id_)
             AND (t.organ_id_=#{organId} OR FIND_IN_SET(#{organId},t.flow_organ_range_))
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
             AND t.is_support_extra_practice_lesson_=1
             AND t.organ_id_!=36
         GROUP BY su.id_
@@ -644,7 +644,7 @@
         WHERE
             FIND_IN_SET(#{subjectId},t.subject_id_)
             AND (t.organ_id_=#{organId} OR FIND_IN_SET(#{organId},t.flow_organ_range_))
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
             AND t.organ_id_!=36
             GROUP BY su.id_
     </select>
@@ -666,7 +666,7 @@
         WHERE
             FIND_IN_SET(#{subjectId},t.subject_id_)
             AND FIND_IN_SET(t.organ_id_,#{organIdList})
-            AND su.del_flag_=0 AND su.lock_flag_=0
+            AND su.del_flag_='0' AND su.lock_flag_=0
             AND t.is_support_extra_practice_lesson_=1
             GROUP BY su.id_
     </select>
@@ -949,7 +949,7 @@
     <select id="findByFlowOrganRangeTeachers" resultMap="TeacherBasicDto">
         SELECT su.id_,su.username_,su.real_name_,t.organ_id_,su.phone_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
-        WHERE su.del_flag_ = 0
+        WHERE su.del_flag_ = '0'
             AND (INTE_ARRAY(#{organId},t.flow_organ_range_) OR FIND_IN_SET(t.organ_id_,#{organId}))
         <if test="demissionFlag != null and demissionFlag == false">
             AND t.demission_date_ IS NULL
@@ -1103,7 +1103,7 @@
         <if test="search != null and search != ''">
             AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
         </if>
-        AND su.del_flag_ = 0 AND su.lock_flag_=0
+        AND su.del_flag_ = '0' AND su.lock_flag_=0
         GROUP BY su.id_
     </select>
     <select id="queryTeacherImModel" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.ImUserModel">
@@ -1431,7 +1431,7 @@
 
     <sql id="queryTeacherMusicIdsCondition">
         <where>
-            cs.del_flag_=0 AND csts.group_type_='MUSIC' AND mg.del_flag_=0 AND mg.status_='PROGRESS' and csts.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND csts.group_type_='MUSIC' AND mg.del_flag_=0 AND mg.status_='PROGRESS' and csts.tenant_id_ = #{tenantId}
             <if test="teacherId!=null">
                 AND csts.user_id_=#{teacherId}
             </if>
@@ -1518,7 +1518,7 @@
     </select>
     <sql id="queryTeacherBasicInfoSql">
         <where>
-            AND t.demission_date_ IS NULL AND su.lock_flag_ = 0 AND su.del_flag_ = 0
+            AND t.demission_date_ IS NULL AND su.lock_flag_ = 0 AND su.del_flag_ = '0'
             <if test="search != null and search != ''">
                 AND (t.id_ = #{search} OR su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
             </if>

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

@@ -139,7 +139,7 @@
 		SELECT cs.id_,cs.group_type_,cs.music_group_id_,cs.class_group_id_,cs.class_date_,cs.start_class_time_,cs.end_class_time_,csts.user_id_ actual_teacher_id_,
 		cs.create_time_,cs.update_time_,cs.teach_mode_,cs.type_,cs.name_,cs.student_num_,cs.schoole_id_,cs.note_,cs.organ_id_,csts.expect_salary_ salary_ 
 		FROM course_schedule_teacher_salary csts left join course_schedule cs on csts.course_schedule_id_ = cs.id_
-		where csts.user_id_ = #{userId} and cs.class_date_ like concat(#{month},'%') and cs.del_flag_ = 0
+		where csts.user_id_ = #{userId} and cs.class_date_ like concat(#{month},'%') and cs.del_flag_ = '0'
 		order by cs.group_type_ desc
 	</select>
 </mapper>

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

@@ -919,8 +919,8 @@
     <select id="queryCurrentMonthCoursesNum" resultType="int">
         select count(cs.id_) from course_schedule cs left join vip_group vg on cs.music_group_id_ = vg.id_ where
         cs.type_ in ('VIP')
-        and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and (cs.del_flag_ = 0 or cs.del_flag_
-        is null) and vg.organ_id_ not in (36,38) and vg.tenant_id_ = #{tenantId}
+        and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m') and cs.del_flag_ = '0'
+        and vg.organ_id_ not in (36,38) and vg.tenant_id_ = #{tenantId}
         <if test="organId != null">
             AND FIND_IN_SET(vg.organ_id_,#{organId})
         </if>