From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 6550d65..7fc929c 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
@@ -44,7 +44,9 @@
*/
List<HouseRentalTenantVO> selectHouseRentalPage(IPage page,
@Param("vo") HouseRentalTenantVO houseRental,
- @Param("list") List<String> list);
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 查询房屋出租情况
@@ -60,7 +62,16 @@
List<HouseRentalStatistics> getStatistics(@Param("vo") HouseRentalTenantVO houseRental,
@Param("list") List<String> list);
- List<HouseRentalExcel> export(HouseRentalVO houseRentalVO);
+ /**
+ * 导出租赁信息
+ * @param houseRental
+ * @return
+ */
+ List<HouseRentalExcel> export(@Param("vo") HouseRentalTenantVO houseRental);
- Integer getStatisticsCount(Long userId);
+ Integer getStatisticsCount(@Param("house") HouseRentalTenantVO houseRental,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("isAdministrator") Integer isAdministrator);
+
}
--
Gitblit v1.9.3