From 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 17:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java | 2 ++
src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
index e7db276..190bd34 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
@@ -10,4 +10,6 @@
private Long count;
private String statusName;
+
+ private String currentDate;
}
diff --git a/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml b/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
index faf9cdf..cc65841 100644
--- a/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml
@@ -16,8 +16,8 @@
<if test="ew.status != null">
and n.status = #{ew.status}
</if>
- <if test="ew.expiration_date != null ">
- and n.expiration_date >= DATE_FORMAT(#{ew.expiration_date},'%Y-%m-%d')
+ <if test="ew.currentDate != null">
+ and n.expiration_date >= DATE_FORMAT(#{ew.currentDate},'%Y-%m-%d')
</if>
</where>
</select>
--
Gitblit v1.9.3