From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java | 12 +++++++++---
1 files changed, 9 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 c9c4628..b70e3d3 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,7 @@
*/
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 +60,9 @@
* @return
*/
List<HouseRentalStatistics> getStatistics(@Param("vo") HouseRentalTenantVO houseRental,
- @Param("list") List<String> list);
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 导出租赁信息
@@ -69,5 +71,9 @@
*/
List<HouseRentalExcel> export(@Param("vo") HouseRentalTenantVO houseRental);
- Integer getStatisticsCount(Long userId,String neiCode);
+ Integer getStatisticsCount(@Param("house") HouseRentalTenantVO houseRental,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("isAdministrator") Integer isAdministrator);
+
}
--
Gitblit v1.9.3