|
@@ -244,7 +244,10 @@
|
|
|
LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = s.user_id_
|
|
|
WHERE s.teacher_id_ = #{teacherId}
|
|
|
<if test="startTime != null and startTime != ''">
|
|
|
- AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} OR mcr.id_ IS NULL)
|
|
|
+ AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') >= #{startTime} OR mcr.id_ IS NULL)
|
|
|
+ </if>
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
+ AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') < #{endTime} OR mcr.id_ IS NULL)
|
|
|
</if>
|
|
|
<if test="search != null and search != ''">
|
|
|
AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
|
|
@@ -274,7 +277,10 @@
|
|
|
LEFT JOIN sys_music_compare_record mcr ON mcr.user_id_ = s.user_id_
|
|
|
WHERE s.teacher_id_ = #{teacherId}
|
|
|
<if test="startTime != null and startTime != ''">
|
|
|
- AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} OR mcr.id_ IS NULL)
|
|
|
+ AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') >= #{startTime} OR mcr.id_ IS NULL)
|
|
|
+ </if>
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
+ AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') < #{endTime} OR mcr.id_ IS NULL)
|
|
|
</if>
|
|
|
<if test="search != null and search != ''">
|
|
|
AND (su.phone_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
|