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 | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 5a48599..7fc929c 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.java
@@ -18,9 +18,13 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.house.entity.HouseRentalEntity;
+import org.springblade.modules.house.vo.HouseRentalStatistics;
+import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseRentalVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.house.excel.HouseRentalExcel;
+
import java.util.List;
/**
@@ -38,7 +42,11 @@
* @param houseRental
* @return
*/
- List<HouseRentalVO> selectHouseRentalPage(IPage page, HouseRentalVO houseRental);
+ List<HouseRentalTenantVO> selectHouseRentalPage(IPage page,
+ @Param("vo") HouseRentalTenantVO houseRental,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 查询房屋出租情况
@@ -46,4 +54,24 @@
* @return
*/
List<HouseRentalVO> getHouseRentalListByCode(@Param("code") String code);
+
+ /**
+ * 获取统计数据
+ * @return
+ */
+ List<HouseRentalStatistics> getStatistics(@Param("vo") HouseRentalTenantVO houseRental,
+ @Param("list") List<String> list);
+
+ /**
+ * 导出租赁信息
+ * @param houseRental
+ * @return
+ */
+ List<HouseRentalExcel> export(@Param("vo") HouseRentalTenantVO houseRental);
+
+ Integer getStatisticsCount(@Param("house") HouseRentalTenantVO houseRental,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("isAdministrator") Integer isAdministrator);
+
}
--
Gitblit v1.9.3