From 3f35d2a696c6d37b14909f5ca87a3f17b8271673 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Sat, 25 Oct 2025 14:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=97=A5=E6=9C=9F=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/service/impl/VerifyDateService.java   |  8 ++++----
 .../resources/mappers/wechat/VerifyDateMapper.xml | 15 +++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java b/src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java
index 0546f58..c30f661 100644
--- a/src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java
+++ b/src/main/java/com/bonus/boot/manager/manager/service/impl/VerifyDateService.java
@@ -45,11 +45,11 @@ public class VerifyDateService {
             String leaveType = dataMap.get("leaveType").toString();
             String userName = dataMap.get("userName").toString();
             if(type == 1){ // 出差
-//                sb.append("出行人：").append(userName).append("出行日期与").append(leaveType).append("存在冲突日期").append("(").append(prominentDate).append(")");
-                sb.append("存在冲突日期");
+                sb.append("出行人：").append(userName).append("出行日期与").append(leaveType).append("存在冲突日期").append("(").append(prominentDate).append(")");
+//                sb.append("存在冲突日期");
             }else{ // 请假、轮休、外出
-//                sb.append("当前提交的申请日期与").append(leaveType).append("存在冲突日期").append("（").append(prominentDate).append("）");
-                sb.append("存在冲突日期");
+                sb.append("当前提交的申请日期与").append(leaveType).append("存在冲突日期").append("（").append(prominentDate).append("）");
+//                sb.append("存在冲突日期");
             }
             return sb.toString();
         }else{
diff --git a/src/main/resources/mappers/wechat/VerifyDateMapper.xml b/src/main/resources/mappers/wechat/VerifyDateMapper.xml
index 98aecca..bc9c335 100644
--- a/src/main/resources/mappers/wechat/VerifyDateMapper.xml
+++ b/src/main/resources/mappers/wechat/VerifyDateMapper.xml
@@ -15,12 +15,15 @@
               user_name AS userName
         FROM leave_apply_wechat
         WHERE user_id = #{params.userId} AND is_active = '1' and examine_status !='2'
-        AND (
-            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})
-        )
+        AND
+        <![CDATA[
+            TIMESTAMPADD(HOUR, (leave_end_interval - 1) * 12, leave_end_date) >= TIMESTAMPADD(HOUR, (#{params.leaveStartInterval} - 1) * 12, #{params.leaveStartDate})
+        ]]>
+        AND
+        <![CDATA[
+            TIMESTAMPADD(HOUR, (leave_start_interval - 1) * 12, leave_start_date) <= TIMESTAMPADD(HOUR, (#{params.leaveEndInterval} - 1) * 12, #{params.leaveEndDate})
+        ]]>
+
         <if test="type == 1">
             <if test="params.uuid!=null and params.uuid!=''">
                 AND leave_form_id != #{params.uuid}