From bec1e27df1cce02f0a4b9aa19a2fc50f4551fb64 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期日, 27 四月 2025 15:00:28 +0800
Subject: [PATCH] 【UPDATE】1.新增或修改日历数据时验证有效日期和失效日期是否重叠 2.增加日历视图页面接口

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
index 1552fe3..b0b0b98 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml
@@ -29,8 +29,7 @@
         <where>  
             <if test="description != null  and description != ''"> and description like '%' || #{description} || '%'</if>
             <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="effectiveDate != null "> and effective_date &gt;= #{effectiveDate}</if>
-            <if test="expiringDate != null "> and expiring_date &lt;= #{expiringDate}</if>
+            <if test="effectiveDate != null and expiringDate != null"> and ((effective_date &gt;= #{effectiveDate} and effective_date &lt;= #{expiringDate}) or (expiring_date &gt;= #{effectiveDate} and expiring_date &lt;= #{expiringDate}))</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="applicableFactory != null  and applicableFactory != ''"> and applicable_factory = #{applicableFactory}</if>
             <if test="applicableWorkshop != null  and applicableWorkshop != ''"> and applicable_workshop = #{applicableWorkshop}</if>

--
Gitblit v1.9.3