|
|
@@ -46,8 +46,8 @@
|
|
|
<if test="dto.punishmentTypeId != null and dto.punishmentTypeId > 0">
|
|
|
and t.punishment_type_id = #{dto.punishmentTypeId}
|
|
|
</if>
|
|
|
- <if test="dto.startDate != null and dto.startDate != '' and dto.endDate != null and dto.endDate != ''">
|
|
|
- and t1.start_time between date_format(#{dto.startDate}, '%Y-%m-%d') and date_format(#{dto.endDate}, '%Y-%m-%d')
|
|
|
+ <if test="dto.startTime != null and dto.startTime != '' and dto.endTime != null and dto.endTime != ''">
|
|
|
+ and t1.start_time between date_format(#{dto.startTime}, '%Y-%m-%d') and date_format(#{dto.endTime}, '%Y-%m-%d')
|
|
|
</if>
|
|
|
<if test="dto.credentialNumber != null and dto.credentialNumber != ''">
|
|
|
and t5.credential_number = #{dto.credentialNumber}
|
