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/mapper/TBillMapper.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 f87f3fe..e0c85e5 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
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -25,6 +26,8 @@
PageInfo<TBillDto> page(@Param("pageInfo") PageInfo<TBill> pageInfo, @Param("query") TBillQuery query);
+ PageInfo<TBillDto> pageForApplet(@Param("pageInfo") PageInfo<TBill> pageInfo, @Param("query") TBillQuery query);
+
List<TBillDto> getBillList(@Param("query")TBillQuery query);
/**
@@ -37,13 +40,13 @@
TBillDto selectDetailByBillId(@Param("billId") String billId);
- BigDecimal statisticsAllRent(@Param("busDeptId") String busDeptId);
+ BigDecimal statisticsAllRent(@Param("query") TBillQuery query);
- BigDecimal statisticsNoPay(@Param("busDeptId") String busDeptId);
+ BigDecimal statisticsNoPay(@Param("query") TBillQuery query);
- BigDecimal statisticsPayed(@Param("busDeptId") String busDeptId);
+ BigDecimal statisticsPayed(@Param("query") TBillQuery query);
- BigDecimal statisticsOverdue(@Param("busDeptId") String busDeptId);
+ BigDecimal statisticsOverdue(@Param("query") TBillQuery query);
Integer batchBillCount(@Param("userId")String userId, @Param("billIds")List<String> billIds);
/**
@@ -51,4 +54,10 @@
* @return
*/
List<ScreenRentRankVO> getStreetRentRank(@Param("businessDeptId") String businessDeptId);
+ /**
+ * 查询季付账单
+ * @param businessDeptId
+ * @return
+ */
+ List<TBill> getJiFuBillList(@Param("businessDeptId") String businessDeptId, @Param("first") Date first, @Param("last") Date last);
}
--
Gitblit v1.7.1