From cd0cc8910180826a92451c44a55c2799d7cdca81 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 10 Nov 2023 17:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index ce1ebb2..ec3fd73 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -36,6 +36,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -189,8 +190,28 @@
return update && addFlag && updateFlag && removeFlag;
}
+ /**
+ * 获取统计数据
+ * @return
+ */
@Override
- public List<HouseRentalStatistics> getStatistics() {
- return baseMapper.getStatistics();
+ public Object getStatistics(HouseRentalTenantVO houseRental) {
+ // 查询
+ List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental);
+ // 返回
+ return statistics;
+ }
+
+ /**
+ * 出租屋 确认
+ * @param houseRental
+ * @return
+ */
+ @Override
+ public Boolean confirmHouseRental(HouseRentalVO houseRental) {
+ // 修改状态
+ houseRental.setUpdateTime(new Date());
+ // 修改
+ return updateById(houseRental);
}
}
--
Gitblit v1.9.3