diff --git a/src/main/resources/mappers/wechat/VerifyDateMapper.xml b/src/main/resources/mappers/wechat/VerifyDateMapper.xml index b285a95..98aecca 100644 --- a/src/main/resources/mappers/wechat/VerifyDateMapper.xml +++ b/src/main/resources/mappers/wechat/VerifyDateMapper.xml @@ -16,10 +16,10 @@ FROM leave_apply_wechat WHERE user_id = #{params.userId} AND is_active = '1' and examine_status !='2' AND ( - DATE_FORMAT(leave_start_date, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{params.leaveStartDate}, '%Y-%m-%d') AND - DATE_FORMAT(#{params.leaveEndDate}, '%Y-%m-%d') OR - DATE_FORMAT(leave_end_date, '%Y-%m-%d') BETWEEN DATE_FORMAT(#{params.leaveStartDate}, '%Y-%m-%d') AND - DATE_FORMAT(#{params.leaveEndDate}, '%Y-%m-%d') + CONCAT(DATE_FORMAT(leave_start_date, '%Y%m%d'),leave_start_interval) BETWEEN CONCAT(DATE_FORMAT(#{params.leaveStartDate}, '%Y%m%d'),#{params.leaveStartInterval}) AND + CONCAT(DATE_FORMAT(#{params.leaveEndDate}, '%Y%m%d'),#{params.leaveEndInterval}) OR + CONCAT(DATE_FORMAT(leave_end_date, '%Y%m%d'),leave_end_interval) BETWEEN CONCAT(DATE_FORMAT(#{params.leaveStartDate}, '%Y%m%d'),#{params.leaveStartInterval}) AND + CONCAT(DATE_FORMAT(#{params.leaveEndDate}, '%Y%m%d'),#{params.leaveEndInterval}) )