From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/controller/HouseRentalController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 2de0768..7fa0571 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -26,7 +26,6 @@
import javax.validation.Valid;
import org.springblade.core.excel.util.ExcelUtil;
-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;
@@ -34,9 +33,7 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.house.vo.HouseRentalTenantVO;
-import org.springblade.modules.house.vo.HouseVO;
-import org.springblade.modules.system.excel.HouseExcel;
-import org.springblade.modules.system.excel.HouseRentalExcel;
+import org.springblade.modules.house.excel.HouseRentalExcel;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.entity.HouseRentalEntity;
@@ -121,7 +118,6 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入houseRental")
public R update(@RequestBody HouseRentalEntity houseRental) {
- houseRental.setUpdateTime(new Date());
houseRental.setUpdateUser(AuthUtil.getUserId());
return R.status(houseRentalService.updateById(houseRental));
}
@@ -185,15 +181,19 @@
return R.data(houseRentalService.getStatistics(houseRental));
}
+
+ @GetMapping("/getStatisticsCount")
+ public R getStatisticsCount(HouseRentalTenantVO houseRental){
+ return R.data(houseRentalService.getStatisticsCount(houseRental));
+ }
+
/**
- * 导出用户
+ * 导出租赁信息
*/
- @GetMapping("export-house")
- @ApiOperationSupport(order = 13)
- @ApiOperation(value = "导出出租房屋", notes = "传入user")
- public void exportUser(HouseRentalVO houseRentalVO, HttpServletResponse response) {
+ @GetMapping("export-houseRental")
+ public void exportHouseRental(HouseRentalTenantVO houseRentalVO, HttpServletResponse response) {
List<HouseRentalExcel> list = houseRentalService.export(houseRentalVO);
- ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, HouseRentalExcel.class);
+ ExcelUtil.export(response, "出租屋数据" + DateUtil.time(), "出租屋数据表", list, HouseRentalExcel.class);
}
--
Gitblit v1.9.3