|
@@ -106,8 +106,11 @@
|
|
|
<if test="featureType != null">
|
|
|
AND smcr.feature_ = #{featureType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
</if>
|
|
|
- <if test="startTime!=null and endTime!=null">
|
|
|
- AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
|
|
|
+ <if test="startTime != null and startTime != ''">
|
|
|
+ AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') >= #{startTime}
|
|
|
+ </if>
|
|
|
+ <if test="endTime != null and endTime != ''">
|
|
|
+ AND DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') <= #{endTime}
|
|
|
</if>
|
|
|
</where>
|
|
|
</sql>
|
|
@@ -246,7 +249,7 @@
|
|
|
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)
|
|
|
+ AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') <= #{endTime} OR mcr.id_ IS NULL)
|
|
|
</if>
|
|
|
WHERE s.teacher_id_ = #{teacherId}
|
|
|
<if test="search != null and search != ''">
|
|
@@ -279,7 +282,7 @@
|
|
|
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)
|
|
|
+ AND (DATE_FORMAT(mcr.create_time_, '%Y-%m-%d') <= #{endTime} OR mcr.id_ IS NULL)
|
|
|
</if>
|
|
|
WHERE s.teacher_id_ = #{teacherId}
|
|
|
<if test="search != null and search != ''">
|