From 9488dcebc30dcdb5234af62976475f5c8b4e27da Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期五, 25 四月 2025 17:02:15 +0800
Subject: [PATCH] 【UPDATE】修改日历模块相关问题
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkCalendarMapper.xml | 4 ++--
1 files changed, 2 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 dc81ab9..1552fe3 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,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="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="applicableFactory != null and applicableFactory != ''"> and applicable_factory = #{applicableFactory}</if>
<if test="applicableWorkshop != null and applicableWorkshop != ''"> and applicable_workshop = #{applicableWorkshop}</if>
--
Gitblit v1.9.3