sql优化

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupSalaryQueryInfo.java

@@ -14,7 +14,7 @@ import java.util.Date;
 public class VipGroupSalaryQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "vip课编号")
-    private Long vipGroupId;
+    private String vipGroupId;
 
     @ApiModelProperty(value = "部门编号")
     private Long organId;

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

@@ -3779,10 +3779,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
     @Override
     public Map<String, Object> findVipGroupSalarys(VipGroupSalaryQueryInfo queryInfo) {
-        if (Objects.isNull(queryInfo.getVipGroupId())) {
+        if (StringUtils.isEmpty(queryInfo.getVipGroupId())) {
             throw new BizException("请指定课程组");
         }
-        VipGroup vipGroup = vipGroupDao.get(queryInfo.getVipGroupId());
+        VipGroup vipGroup = vipGroupDao.get(Long.parseLong(queryInfo.getVipGroupId()));
         if (Objects.isNull(vipGroup)) {
             throw new BizException("未找到指定课程组");
         }
@@ -3824,7 +3824,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         pageInfo.setRows(dataList);
 
-        VipGroupSalaryBaseInfo vipGroupSalaryBaseInfo = vipGroupDao.getVipGroupSalaryInfo(queryInfo.getVipGroupId());
+        VipGroupSalaryBaseInfo vipGroupSalaryBaseInfo = vipGroupDao.getVipGroupSalaryInfo(vipGroup.getId());
         if (Objects.isNull(vipGroupSalaryBaseInfo)) {
             vipGroupSalaryBaseInfo = new VipGroupSalaryBaseInfo();
         }

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

@@ -119,7 +119,7 @@
 
 	<sql id="queryCondition">
 		<where>
-			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+			cs.del_flag_ = '0'
 			<if test="createTime != null">
 				AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
 			</if>
@@ -209,8 +209,7 @@
 			LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_=csts.course_schedule_id_
 			LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
 			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-			WHERE
-			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+			WHERE cs.del_flag_ = '0'
 			AND csts.user_id_=#{userId}
 			<if test="classGroupId!=null">
 				AND ch.class_group_id_=#{classGroupId}

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

@@ -627,8 +627,7 @@
             <if test="transactionTeacherId!=null">
                 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_ != 1 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0' 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=")">
@@ -668,8 +667,7 @@
         <if test="transactionTeacherId!=null">
             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_ != 1 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0' 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
@@ -725,9 +723,8 @@
             LEFT JOIN course_schedule_complaints csc ON csc.course_schedule_id_=cssp.course_schedule_id_ AND
             csc.user_id_=#{studentId}
         LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_ AND sa.user_id_=#{studentId}
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0'
+        AND cs.is_lock_ = 0
         AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
         AND cssp.user_id_ = #{studentId} AND cs.pre_course_flag_ != 1
         <if test="quitClassGroupIds != null and quitClassGroupIds.size()>0">
@@ -773,9 +770,7 @@
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         LEFT JOIN school s ON cs.schoole_id_ = s.id_
         LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
         AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
@@ -811,9 +806,8 @@
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         LEFT JOIN school s ON cs.schoole_id_ = s.id_
         LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL) and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0'
+        AND cs.is_lock_ = 0 and cs.tenant_id_ = #{tenantId}
         <if test="teacherId!=null">
             AND cs.actual_teacher_id_=#{teacherId}
         </if>
@@ -865,8 +859,8 @@
                  LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
                  LEFT JOIN school s ON cs.schoole_id_ = s.id_
                  LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_ AND ta.teacher_id_ = #{teacherId}
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-            AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0'
+            AND cs.is_lock_ = 0
           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_ != 1
@@ -1020,15 +1014,13 @@
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 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' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="month!=null">
-            AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
@@ -1042,18 +1034,16 @@
         FROM
         course_schedule cs
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
-        AND cg.del_flag_ = 0 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
+        AND cg.del_flag_ = '0' and cs.tenant_id_ = #{tenantId}
         <if test="teacherId!=null">
             AND cs.actual_teacher_id_=#{teacherId}
         </if>
         <if test="month==null">
-            AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="month!=null">
-            AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="groupId!=null">
             AND cs.music_group_id_=#{groupId}
@@ -1071,17 +1061,15 @@
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
         LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+        WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
         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_ != 1
+        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' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
         </if>
         <if test="month!=null">
-            AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+            AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
         </if>
         GROUP BY cs.class_date_
     </select>
@@ -1092,17 +1080,16 @@
         FROM
             course_schedule cs
             LEFT JOIN teacher t ON cs.actual_teacher_id_=t.id_
-        WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
             AND cs.class_group_id_ IN
             <foreach collection="classGroupIds" item="classGroupId" separator="," open="(" close=")">
                 #{classGroupId}
             </foreach>
             <if test="month==null">
-                AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+                AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
             </if>
             <if test="month!=null">
-                AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+                AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
             </if>
             <if test="type!=null and type!=''">
                 AND cs.group_type_=#{type}
@@ -1119,8 +1106,7 @@
             <if test="transactionTeacherId!=null">
                 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_ != 1 and cs.tenant_id_ = #{tenantId}
+        WHERE cs.del_flag_ = '0' 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=")">
@@ -1128,10 +1114,10 @@
                 </foreach>
             </if>
             <if test="month==null">
-                AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+                AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(CURDATE(),'%Y-%m'),'-31 23:59:59')
             </if>
             <if test="month!=null">
-                AND DATE_FORMAT( #{month}, '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
+                AND cs.class_date_ BETWEEN CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-01 00:00:00') AND CONCAT(DATE_FORMAT(#{month},'%Y-%m'),'-31 23:59:59')
             </if>
             <if test="type!=null and type!=''">
                 AND cs.group_type_=#{type}
@@ -1250,7 +1236,7 @@
         SELECT cs.*
         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)
+        WHERE cs.del_flag_ = '0'
           AND cg.music_group_id_ = #{musicGroupId}
     </select>
     <select id="countClassTimes" resultType="int">
@@ -1512,8 +1498,7 @@
 
     <sql id="teacherClassCourseScheduleQueryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-            AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+            cs.del_flag_ = '0' AND cs.is_lock_ = 0
             AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
             <if test="userId != null">
                 AND csts.user_id_ = #{userId}
@@ -1651,8 +1636,7 @@
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         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_ != 1
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         AND sa.class_group_id_=#{classGroupId}
         <if test="userId != null">
             AND sa.teacher_id_=#{userId}
@@ -1685,8 +1669,7 @@
         FROM
         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_ != 1
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         AND sa.class_group_id_=#{classGroupId}
         <if test="userId != null">
             AND sa.teacher_id_=#{userId}
@@ -1706,7 +1689,7 @@
                COUNT(cs.id_) as 'value'
         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)
+        WHERE cs.del_flag_ = '0'
           AND cg.music_group_id_ = #{musicGroupId} AND cs.pre_course_flag_ != 1
         GROUP BY cg.id_
     </select>
@@ -1757,8 +1740,7 @@
         FROM course_schedule cs
         LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
         LEFT JOIN music_group mg ON cs.music_group_id_=mg.id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_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">
@@ -1866,7 +1848,7 @@
         SELECT COUNT(csts.course_schedule_id_)
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND csts.user_id_ = #{teacherId}
           AND cs.class_date_ = DATE_FORMAT(#{classDate}, '%Y-%m-%d')
           AND DATE_FORMAT(#{startTime}, '%H:%i:%S') &lt;= DATE_FORMAT(cs.end_class_time_, '%H:%i:%S')
@@ -2152,7 +2134,7 @@
         SELECT cs.*
         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)
+        WHERE cs.del_flag_ = '0'
           AND cssp.music_group_id_ = #{musicGroupId}
           AND cssp.group_type_ = #{groupType}
           AND cs.status_ = #{status}
@@ -2248,7 +2230,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_ != 1
+          AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="countVipGroupCourses" resultType="int">
         SELECT count(cs.id_)
@@ -2426,7 +2408,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_ != 1
+        WHERE cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
           <if test="groupType != null">
           AND cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           </if>
@@ -2454,8 +2436,7 @@
         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)
+        WHERE cs.del_flag_ = '0'
         AND cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         AND cs.music_group_id_ = #{groupId}
         AND cssp.user_id_=#{userId}
@@ -2482,7 +2463,7 @@
     <select id="findSurplusCourseWithGroup" resultMap="CourseSchedule">
         SELECT <include refid="resultSql"/>
         FROM course_schedule cs
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
           AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
           AND cs.music_group_id_ = #{groupId}
@@ -2491,7 +2472,7 @@
     <select id="getSurplusCourseWithGroup" resultMap="CourseSchedule">
         SELECT <include refid="resultSql"/>
         FROM course_schedule cs
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
           AND cs.id_ = #{courseScheduleId}
     </select>
@@ -2746,8 +2727,7 @@
         FROM
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
         AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND DATE_FORMAT(#{endTime},"%Y-%m-%d")
         AND csts.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
@@ -2758,7 +2738,7 @@
         SELECT COUNT(1)
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cs.group_type_ = 'PRACTICE'
           AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") AND DATE_FORMAT(#{endTime}, "%Y-%m-%d")
           AND csts.user_id_ = #{userId}
@@ -2772,7 +2752,7 @@
                cs.group_type_
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") AND DATE_FORMAT(#{endTime}, "%Y-%m-%d")
           AND csts.user_id_ = #{userId}
     </select>
@@ -2786,7 +2766,7 @@
                cs.group_type_
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") AND DATE_FORMAT(#{endTime}, "%Y-%m-%d")
           AND csts.user_id_ = #{userId}
     </select>
@@ -2841,7 +2821,7 @@
         FROM course_schedule_teacher_salary csts
                  LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
                  LEFT JOIN class_group cg ON cg.id_ = csts.class_group_id_
-        WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
           AND csts.user_id_ = #{userId}
           <if test="groupType != null">
           	and cs.group_type_ = #{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
@@ -2955,7 +2935,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_ != 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCourses2" resultMap="CourseSchedule">
         SELECT
@@ -2978,7 +2958,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_ != 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCourses3" resultMap="CourseSchedule">
         SELECT
@@ -3000,7 +2980,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_ != 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
     </select>
     <select id="findUserCoursesWithPay" resultMap="CourseSchedule">
         SELECT
@@ -3023,7 +3003,7 @@
         <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
             #{teacherId}
         </foreach>
-        AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL )
+        AND cs.del_flag_ = '0'
     </select>
 
     <select id="queryTeacherName" resultType="java.util.Map">
@@ -3075,7 +3055,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_ != 1
+        AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
         ORDER BY start_class_time_
     </select>
 

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

@@ -253,7 +253,7 @@
 			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)
+			cs.del_flag_ = '0'
 			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_ != 1
@@ -264,8 +264,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)
+		WHERE cs.del_flag_ = '0'
 		AND cs.class_group_id_ = #{classGroupId} AND cs.pre_course_flag_ != 1
     </select>
 	<select id="findNotStartCourseStudentPaymentIdsWithClassGroupAndStudent" resultType="int">
@@ -729,7 +728,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_ != 1
+		  AND cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1
 		ORDER BY CONCAT(cs.class_date_, ' ', cs.start_class_time_) DESC LIMIT 1
 	</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_ != 1
+			cs.del_flag_ = '0' 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}
@@ -262,7 +262,7 @@
 
 	<sql id="vipGroupSalaryQueryCondition">
 		<where>
-			vg.id_ = #{vipGroupId}
+			cs.music_group_id_ = #{vipGroupId}
 			<if test="groupType != null and groupType != ''">
 				AND cs.group_type_= #{groupType}
 			</if>
@@ -274,17 +274,14 @@
 
 	<select id="findVipGroupSalarys" resultMap="VipGroupSalaryDto">
 		SELECT
-
 			cs.id_ course_schedule_id_,
 			CONCAT(cs.class_date_," ",cs.start_class_time_) class_date_,
 			cs.teach_mode_,
 			csts.*
-		FROM
-			vip_group vg
-			LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_
+		FROM course_schedule cs
 			LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
 			<include refid="vipGroupSalaryQueryCondition"/>
-		ORDER BY class_date_
+		ORDER BY cs.class_date_
 		<include refid="global.limit"/>
 	</select>
 	<select id="countVipGroupSalarys" resultType="int">

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

@@ -274,8 +274,7 @@
             LEFT JOIN class_group cg ON dg.id_=cg.music_group_id_ AND cg.group_type_='DEMO'
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
             LEFT JOIN `subject` s ON s.id_ = dg.subject_id_
-        WHERE
-        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
         AND cs.type_ = 'DEMO' AND dg.user_id_ = #{teacherId}
         GROUP BY cs.class_date_
         <include refid="global.limit"/>

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

@@ -61,9 +61,7 @@
     LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
     LEFT JOIN school s ON cs.schoole_id_ = s.id_
     LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{param.teacherId}
-    WHERE
-    (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-    AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
+    WHERE cs.del_flag_ = '0' AND cs.is_lock_ = 0
     and cs.type_ = 'LIVE'
     <if test="param.startTime != null">
         AND cs.class_date_ &gt;= date_format(#{param.startTime},'%Y-%m-%d')

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_ != 1 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' 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_ != 1
+            cs.del_flag_ = '0' 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=",">

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_ != 1 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' 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>

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

@@ -862,7 +862,7 @@
         ) music_cs ON FIND_IN_SET(music_cs.id_, se.course_ids_)
         WHERE se.teacher_id_ = #{teacherId}
         AND se.expect_exercises_num_ > se.actual_exercises_num_
-        AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN se.monday_ AND se.sunday_
+        AND se.monday_ >= CONCAT(CURDATE(),' 00:00:00') AND se.sunday_ <= CONCAT(CURDATE(),' 23:59:59')
         AND se.serve_type_ = 'HOMEWORK'
         AND music_cs.id_ IS NOT NULL
         UNION ALL
@@ -875,7 +875,7 @@
         ) non_music_cs ON FIND_IN_SET(non_music_cs.id_, se.course_ids_)
         WHERE se.teacher_id_ = #{teacherId}
         AND se.expect_exercises_num_ > se.actual_exercises_num_
-        AND DATE_FORMAT(NOW(), '%Y-%m-%d') BETWEEN se.monday_ AND se.sunday_
+        AND se.monday_ >= CONCAT(CURDATE(),' 00:00:00') AND se.sunday_ <= CONCAT(CURDATE(),' 23:59:59')
         AND se.serve_type_ = 'HOMEWORK'
         AND non_music_cs.id_ IS NOT NULL
         ) t

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

@@ -301,7 +301,7 @@
 
     <sql id="studentManageCourseQueryCondition">
         <where>
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND cs.pre_course_flag_ != 1
+            cs.del_flag_ = '0' 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_ != 1 and cssp.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' 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_ != 1 and cssp.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' 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_ != 1 and sa.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and sa.tenant_id_ = #{tenantId}
             <if test="musicGroupId != null">
                 AND sa.music_group_id_ = #{musicGroupId}
             </if>

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_ != 1 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' 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>
@@ -421,8 +421,7 @@
             LEFT JOIN course_schedule cs ON ta.course_schedule_id_ = cs.id_
             LEFT JOIN music_group mg ON ta.music_group_id_ = mg.id_
             LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
-        WHERE
-            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        WHERE cs.del_flag_ = '0'
             AND mg.organ_id_ = #{organId}
             AND ta.sign_in_status_ = #{signInStatus}
             <if test="date==null">