|
@@ -335,8 +335,8 @@
|
|
|
pg.single_class_minutes_ total_minutes_
|
|
|
FROM practice_group pg
|
|
|
LEFT JOIN class_group cg on pg.id_ = cg.music_group_id_ AND cg.group_type_ = 'PRACTICE'
|
|
|
- WHERE pg.courses_start_date_ <= #{nowDate}
|
|
|
- AND pg.courses_expire_date_ >= #{afterDate}
|
|
|
+ WHERE pg.courses_start_date_ <= #{nowDate,jdbcType=DATE}
|
|
|
+ AND pg.courses_expire_date_ >= #{afterDate,jdbcType=DATE}
|
|
|
AND DATE_FORMAT(pg.courses_expire_date_, '%d') = DATE_FORMAT(#{afterDate}, '%d')
|
|
|
AND cg.del_flag_ = 0
|
|
|
AND pg.group_status_ != 'CANCEL'
|
|
@@ -349,7 +349,7 @@
|
|
|
<foreach collection="classGroupIds" item="classGroupId" open="(" separator="," close=")">
|
|
|
#{classGroupId}
|
|
|
</foreach>
|
|
|
- <![CDATA[AND class_date_ >= #{startDate} AND class_date_ <=#{endDate} ]]>
|
|
|
+ <![CDATA[AND class_date_ >= #{startDate,jdbcType=DATE} AND class_date_ <=#{endDate,jdbcType=DATE} ]]>
|
|
|
AND (del_flag_ =0 OR del_flag_ IS NULL)
|
|
|
GROUP BY class_group_id_
|
|
|
</select>
|