sql优化

mec-application/src/main/java/com/ym/mec/teacher/controller/StudentController.java

@@ -46,8 +46,8 @@ public class StudentController extends BaseController {
         queryInfo.setTeacherIdList(sysUserService.getUserId().toString());
         queryInfo.setSearchType("STUDENT_ERR_ATTENDANCE");
         Date date = new Date();
-        queryInfo.setStartTime(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(date, -1)));
-        queryInfo.setEndTime(date);
+        queryInfo.setStartTime(DateUtil.format(DateUtil.getFirstDayOfMonth(DateUtil.addMonths(date, -1)),DateUtil.DEFAULT_PATTERN));
+        queryInfo.setEndTime(DateUtil.format(date,DateUtil.DEFAULT_PATTERN));
         return succeed(courseScheduleService.endFindCourseSchedules(queryInfo));
     }
 

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

@@ -47,10 +47,10 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     private String teacherName;
 
     @ApiModelProperty(value = "上课开始时间")
-    private Date startTime;
+    private String startTime;
 
     @ApiModelProperty(value = "上课结束时间")
-    private Date endTime;
+    private String endTime;
 
 	@ApiModelProperty(value = "上课时间字符")
 	private String startClassTimeStr;

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

@@ -2516,7 +2516,7 @@
 
     <sql id="endFindCourseSchedulesCondition">
         <where>
-            cs.del_flag_ = '0' AND cs.pre_course_flag_ != 1 and cs.tenant_id_ = #{tenantId}
+            cs.del_flag_ = '0' AND cs.pre_course_flag_ = 0 and cs.tenant_id_ = #{tenantId}
             <include refid="queryVipCourseScheduleIds"/>
         </where>
     </sql>
@@ -2530,11 +2530,11 @@
             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_,
-            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_
-            LEFT JOIN organization o ON cs.organ_id_=o.id_
+            LEFT JOIN school s ON cs.schoole_id_ = s.id_
+            LEFT JOIN organization o ON cs.organ_id_ = o.id_
             LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
             left join teacher_attendance ta on ta.course_schedule_id_ = cs.id_
             <if test="studentId != null or searchType == 'TEACHER_ERR_ATTENDANCE' or searchType == 'STUDENT_ERR_ATTENDANCE'">
@@ -2633,11 +2633,8 @@
         <if test="isCallNames != null and isCallNames == 0">
             AND sa.id_ IS NULL
         </if>
-        <if test="startTime!=null">
-            AND cs.class_date_ &gt;= DATE_FORMAT(#{startTime},"%Y-%m-%d")
-        </if>
-        <if test="endTime!=null">
-            AND cs.class_date_ &lt;= DATE_FORMAT(#{endTime},"%Y-%m-%d")
+        <if test="startTime != null AND startTime != ''">
+            AND cs.class_date_ BETWEEN #{startTime} AND #{endTime}
         </if>
         <if test="startClassTimeStr!=null">
             AND cs.start_class_time_ &gt;= #{startClassTimeStr}