From 365b5ad817c9c8a2992d505aa39eccfa2be0460e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 09:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/controller/HouseRentalController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 8c20769..8686fcd 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -26,8 +26,10 @@
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.entity.HouseRentalEntity;
@@ -35,6 +37,8 @@
import org.springblade.modules.house.wrapper.HouseRentalWrapper;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.Date;
/**
* 出租屋 控制器
@@ -77,8 +81,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入houseRental")
- public R<IPage<HouseRentalVO>> page(HouseRentalVO houseRental, Query query) {
- IPage<HouseRentalVO> pages = houseRentalService.selectHouseRentalPage(Condition.getPage(query), houseRental);
+ public R<IPage<HouseRentalTenantVO>> page(HouseRentalTenantVO houseRental, Query query) {
+ IPage<HouseRentalTenantVO> pages = houseRentalService.selectHouseRentalPage(Condition.getPage(query), houseRental);
return R.data(pages);
}
@@ -108,7 +112,9 @@
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入houseRental")
- public R update(@Valid @RequestBody HouseRentalEntity houseRental) {
+ public R update(@RequestBody HouseRentalEntity houseRental) {
+ houseRental.setUpdateTime(new Date());
+ houseRental.setUpdateUser(AuthUtil.getUserId());
return R.status(houseRentalService.updateById(houseRental));
}
@@ -152,5 +158,10 @@
return R.status(houseRentalService.removeHouseRental(id));
}
+ @GetMapping("/getStatistics")
+ public R getStatistics(){
+ return R.data(houseRentalService.getStatistics());
+ }
+
}
--
Gitblit v1.9.3