From a1d8ea1a72cddf7651742b87f042602ab006c879 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 17:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
index 9a94a8c..319ad62 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
@@ -41,7 +41,9 @@
* @param houseRental
* @return
*/
- List<HouseRentalTenantVO> selectHouseRentalPage(IPage page, @Param("vo") HouseRentalTenantVO houseRental);
+ List<HouseRentalTenantVO> selectHouseRentalPage(IPage page,
+ @Param("vo") HouseRentalTenantVO houseRental,
+ @Param("list") List<String> list);
/**
* 查询房屋出租情况
@@ -50,5 +52,10 @@
*/
List<HouseRentalVO> getHouseRentalListByCode(@Param("code") String code);
- List<HouseRentalStatistics> getStatistics();
+ /**
+ * 获取统计数据
+ * @return
+ */
+ List<HouseRentalStatistics> getStatistics(@Param("vo") HouseRentalTenantVO houseRental,
+ @Param("list") List<String> list);
}
--
Gitblit v1.9.3