From ab87626ef2347333285a32eab5c26e6b7e8ca0c3 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 17 Mar 2025 16:07:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=A4=96=E5=87=BA=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=BA=86=E4=B8=8A=E5=8D=88=E7=9A=84=EF=BC=8C=E5=B0=B1?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=B3=E8=AF=B7=E4=B8=8B=E5=8D=88=E7=9A=84?= =?UTF-8?q?=E4=BA=86=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mappers/wechat/VerifyDateMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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}) )