From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwContractMapper.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwContractMapper.java b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwContractMapper.java
index b0d0f7a..467af94 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwContractMapper.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/mapper/MwContractMapper.java
@@ -8,6 +8,9 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 合同 Mapper 接口
@@ -23,7 +26,16 @@
      *
      * @param page
      * @param query
+     * @param treeCode
      * @return
      */
-    Page<MwContractVO> pageList(Page<MwContractVO> page, @Param("query") MwContractQuery query);
+    Page<MwContractVO> pageList(Page<MwContractVO> page, @Param("query") MwContractQuery query, @Param("treeCode") String treeCode);
+
+    /**
+     * 查询未过期合同列表
+     *
+     * @param date
+     * @return
+     */
+    List<MwContractVO> queryListTerminationDateBeforeNow(Date date);
 }

--
Gitblit v1.7.1