| | |
| | | carryOut as carryOut, |
| | | money as money, |
| | | insertTime as insertTime |
| | | from t_driver_activity_history where `day` between #{start} and #{end} and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime) |
| | | from t_driver_activity_history where `day` between DATE_FORMAT(#{start}, '%Y-%m-%d') and DATE_FORMAT(#{end}, '%Y-%m-%d') and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime) |
| | | <if test="null != type"> |
| | | and `type` = #{type} |
| | | </if> |