From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息

---
 src/main/java/org/springblade/modules/house/controller/HouseRentalController.java |   75 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 5 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 c7720f3..5e9d4a4 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -21,13 +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;
@@ -35,6 +41,9 @@
 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;
+import java.util.List;
 
 /**
  * 出租屋 控制器
@@ -77,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);
 	}
 
@@ -98,7 +107,7 @@
 	@PostMapping("/add")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "自定义新增", notes = "传入houseRentalVo")
-	public R add(@Valid @RequestBody HouseRentalVO houseRentalVO) {
+	public R add(@RequestBody HouseRentalVO houseRentalVO) {
 		return R.status(houseRentalService.add(houseRentalVO));
 	}
 
@@ -108,8 +117,29 @@
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入houseRental")
-	public R update(@Valid @RequestBody HouseRentalEntity houseRental) {
+	public R update(@RequestBody HouseRentalEntity houseRental) {
+		houseRental.setUpdateUser(AuthUtil.getUserId());
 		return R.status(houseRentalService.updateById(houseRental));
+	}
+
+	/**
+	 * 出租屋 自定义修改
+	 * @param houseRental
+	 * @return
+	 */
+	@PostMapping("/updateHouseRental")
+	public R updateHouseRental(@RequestBody HouseRentalVO houseRental) {
+		return R.status(houseRentalService.updateHouseRental(houseRental));
+	}
+
+	/**
+	 * 出租屋 确认
+	 * @param houseRental
+	 * @return
+	 */
+	@PostMapping("/confirmHouseRental")
+	public R confirmHouseRental(@RequestBody HouseRentalVO houseRental) {
+		return R.status(houseRentalService.confirmHouseRental(houseRental));
 	}
 
 	/**
@@ -132,5 +162,40 @@
 		return R.status(houseRentalService.removeByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 出租屋 自定义删除
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/removeHouseRental")
+	public R removeHouseRental(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+		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){
+		houseRental.setUserId(AuthUtil.getUserId());
+		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