sql优化

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

@@ -2612,13 +2612,13 @@
     <sql id="queryVipCourseScheduleIds">
         <if test="mergeCourseType != null and mergeCourseType != ''">
             <if test="mergeCourseType == 'MASTER'">
-                AND cs.new_course_id_ = cs.id_
+                AND cs.merge_flag_ = 1
             </if>
             <if test="mergeCourseType == 'ASSIST'">
-                AND cs.new_course_id_ > 0 AND cs.new_course_id_ != cs.id_
+                AND cs.merge_flag_ = 2
             </if>
             <if test="mergeCourseType == 'ALL'">
-                AND cs.new_course_id_ > 0
+                AND cs.merge_flag_ IN (1,2)
             </if>
         </if>
         <if test="studentId != null">
@@ -3718,7 +3718,7 @@
         <foreach collection="classGroupIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>
-        AND new_course_id_ IS NOT NULL AND pre_course_flag_ = 0
+        AND merge_flag_ IN (1,2) IS NOT NULL AND pre_course_flag_ = 0
         AND status_ = 'NOT_START'
     </select>
     <select id="getLock" resultMap="CourseSchedule">
@@ -3928,7 +3928,7 @@
         FROM
         course_schedule cs
         WHERE
-            cs.new_course_id_ != cs.id_
+            cs.merge_flag_ = 2
             AND cs.new_course_id_ IN
             <foreach collection="courseIds" item="courseId" open="(" close=")" separator=",">
                 #{courseId}

mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java

@@ -153,20 +153,16 @@ public class BaseController {
         StringBuffer sb = new StringBuffer();
         // 打印请求日志或执行其他逻辑
         sb.append("Request URI: ").append(request.getRequestURI());
-//        businessLogger.info("Request URI: {}", request.getRequestURI());
         Map<String, String> requestParams = getRequestParameters(request);
         if (!requestParams.isEmpty()) {
-//            businessLogger.info("Request Parameters: {}", requestParams);
             sb.append(", Request Parameters: ").append(requestParams);
         }
         Map<String, String> requestHeaders = getRequestHeaders(request);
         if (!requestHeaders.isEmpty()) {
-//            businessLogger.info("Request Headers: {}", requestHeaders);
             sb.append(", Request Headers: ").append(requestHeaders);
         }
         String requestBody = getRequestBody(request);
         if (!requestBody.isEmpty()) {
-//            businessLogger.info("Request JSON: {}", requestBody);
             sb.append(", Request JSON: ").append(requestBody);
         }
         return sb.toString();