From 2eb2ba547d0c0087b4619033db9f0d2a0cff0b06 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 四月 2025 11:31:33 +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 | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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..1946395 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,23 @@
* 查询街道租金排行
* @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);
+
+ void editAmount(TbillSaveDto bill);
}
--
Gitblit v1.7.1