From 099ea14bba367fd86f0dde37d908f07cc04c3d39 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 四月 2025 15:38:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBillMapper.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 357d516..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
@@ -5,11 +5,12 @@
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.vo.ScreenRentRankVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
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,24 @@
TBillDto selectDetailByBillId(@Param("billId") String billId);
- BigDecimal statisticsAllRent();
+ BigDecimal statisticsAllRent(@Param("query") TBillQuery query);
- BigDecimal statisticsNoPay();
+ BigDecimal statisticsNoPay(@Param("query") TBillQuery query);
- BigDecimal statisticsPayed();
+ BigDecimal statisticsPayed(@Param("query") TBillQuery query);
- BigDecimal statisticsOverdue();
+ BigDecimal statisticsOverdue(@Param("query") TBillQuery query);
Integer batchBillCount(@Param("userId")String userId, @Param("billIds")List<String> billIds);
+ /**
+ * 街道租金排行
+ * @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