|
|
@@ -32,7 +32,8 @@
|
|
|
</if>
|
|
|
</if>
|
|
|
<if test="dto.startDate != null and dto.endDate != null">
|
|
|
- and t1.schedule_date between #{dto.startDate} and #{dto.endDate}
|
|
|
+ and t1.schedule_date >= DATE(#{dto.startDate})
|
|
|
+ and t1.schedule_date < DATE_ADD(DATE(#{dto.endDate}), INTERVAL 1 DAY)
|
|
|
</if>
|
|
|
<if test="dto.toDay != null">
|
|
|
and t1.schedule_date = #{dto.toDay}
|
|
|
@@ -45,6 +46,7 @@
|
|
|
</if>
|
|
|
ORDER BY t1.weeks,t1.time_period,t1.time_number
|
|
|
</select>
|
|
|
+
|
|
|
<select id="getAdjustList" parameterType="com.xjrsoft.module.schedule.dto.CourseTableAdjustDto" resultType="com.xjrsoft.module.schedule.vo.CourseListVo">
|
|
|
SELECT t1.time_period,t4.short_name as time_number,t1.course_name,t2.name AS class_name,t3.name AS classroom_name,t1.id,t2.id as class_id FROM course_table t1
|
|
|
LEFT JOIN base_class t2 ON t1.class_id = t2.id
|