From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
index 6a447fb..357d516 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java
@@ -9,6 +9,7 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -34,5 +35,15 @@
*/
List<TBillDto> invoiceList(@Param("query")TBillQuery query, @Param("pageInfo")PageInfo<TBillDto> pageInfo);
- TBillDto selectTenentByBillId(@Param("billId") String billId);
+ TBillDto selectDetailByBillId(@Param("billId") String billId);
+
+ BigDecimal statisticsAllRent();
+
+ BigDecimal statisticsNoPay();
+
+ BigDecimal statisticsPayed();
+
+ BigDecimal statisticsOverdue();
+
+ Integer batchBillCount(@Param("userId")String userId, @Param("billIds")List<String> billIds);
}
--
Gitblit v1.7.1