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/controller/HouseRentalController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
index 8686fcd..68d0f54 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -129,6 +129,16 @@
}
/**
+ * 出租屋 确认
+ * @param houseRental
+ * @return
+ */
+ @PostMapping("/confirmHouseRental")
+ public R confirmHouseRental(@RequestBody HouseRentalVO houseRental) {
+ return R.status(houseRentalService.confirmHouseRental(houseRental));
+ }
+
+ /**
* 出租屋 新增或修改
*/
@PostMapping("/submit")
@@ -158,9 +168,13 @@
return R.status(houseRentalService.removeHouseRental(id));
}
+ /**
+ * 获取统计数据
+ * @return
+ */
@GetMapping("/getStatistics")
- public R getStatistics(){
- return R.data(houseRentalService.getStatistics());
+ public R getStatistics(HouseRentalTenantVO houseRental){
+ return R.data(houseRentalService.getStatistics(houseRental));
}
--
Gitblit v1.9.3