From 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 14:18:53 +0800
Subject: [PATCH] 文章通过范围查询
---
src/main/java/org/springblade/modules/house/controller/HouseRentalController.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 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 ac3b169..22cdc98 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -21,14 +21,19 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.excel.util.ExcelUtil;
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.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.house.vo.HouseRentalTenantVO;
+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;
@@ -38,6 +43,7 @@
import org.springblade.core.boot.ctrl.BladeController;
import java.util.Date;
+import java.util.List;
/**
* 出租屋 控制器
@@ -80,8 +86,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);
}
@@ -128,6 +134,16 @@
}
/**
+ * 出租屋 确认
+ * @param houseRental
+ * @return
+ */
+ @PostMapping("/confirmHouseRental")
+ public R confirmHouseRental(@RequestBody HouseRentalVO houseRental) {
+ return R.status(houseRentalService.confirmHouseRental(houseRental));
+ }
+
+ /**
* 出租屋 新增或修改
*/
@PostMapping("/submit")
@@ -157,5 +173,29 @@
return R.status(houseRentalService.removeHouseRental(id));
}
+ /**
+ * 获取统计数据
+ * @return
+ */
+ @GetMapping("/getStatistics")
+ public R getStatistics(HouseRentalTenantVO houseRental){
+ return R.data(houseRentalService.getStatistics(houseRental));
+ }
+
+
+ @GetMapping("/getStatisticsCount")
+ public R getStatisticsCount(HouseRentalTenantVO houseRental){
+ return R.data(houseRentalService.getStatisticsCount(houseRental));
+ }
+
+ /**
+ * 导出租赁信息
+ */
+ @GetMapping("export-houseRental")
+ public void exportHouseRental(HouseRentalTenantVO houseRentalVO, HttpServletResponse response) {
+ List<HouseRentalExcel> list = houseRentalService.export(houseRentalVO);
+ ExcelUtil.export(response, "出租屋数据" + DateUtil.time(), "出租屋数据表", list, HouseRentalExcel.class);
+ }
+
}
--
Gitblit v1.9.3