From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
index 7e6f3ae..cc4ff80 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
@@ -15,6 +15,7 @@
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.util.function.Consumer;
@@ -95,5 +96,21 @@
* 查询街道租金排行
* @return
*/
- List<ScreenRentRankVO> getStreetRentRank();
+ List<ScreenRentRankVO> getStreetRentRank(String businessDeptId);
+
+ /**
+ * 查询季付账单
+ * @param businessDeptId
+ * @return
+ */
+ List<TBill> getJiFuBillList(String businessDeptId);
+
+ /**
+ * 查询当前季度的季付账单
+ * @param businessDeptId
+ * @param first
+ * @param last
+ * @return
+ */
+ List<TBill> getJiFuBillListByTime(String businessDeptId, Date first, Date last);
}
--
Gitblit v1.7.1