From 7e372698c42c047d3b4e629dafe4e7b689990b9d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 19:34:16 +0800
Subject: [PATCH] 钣金计划：从Redis中读取库存信息

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 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 dc81ab9..642ac4c 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,9 +29,8 @@
         <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 = #{effectiveDate}</if>
-            <if test="expiringDate != null "> and expiring_date = #{expiringDate}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</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>
             <if test="applicableProcess != null  and applicableProcess != ''"> and applicable_process = #{applicableProcess}</if>

--
Gitblit v1.9.3