From d66b806d685672f2f817986e89f69fb09d130f11 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 09 四月 2025 18:02:32 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 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..619dd06 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;
@@ -29,6 +30,9 @@
public interface TBillService extends IService<TBill> {
PageInfo<TBillDto> queryPage(TBillQuery query);
+
+
+ PageInfo<TBillDto> queryPageForApplet(TBillQuery query);
/**
*
@@ -87,7 +91,7 @@
Boolean cashPay(CachPayDto offlinePayDto);
- BillStatisticsDto statistics(String busdeptId);
+ BillStatisticsDto statistics(TBillQuery query);
Integer batchBillCount(String userId, List<String> billIds);
@@ -95,5 +99,24 @@
* 查询街道租金排行
* @return
*/
+ 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);
List<ScreenRentRankVO> getStreetRentRank();
+
+ void editAmount(TbillSaveDto bill);
}
--
Gitblit v1.7.1