From 8d8c7da4e91028fc877f101dcd244bef3e18c197 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 07:34:21 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/house/controller/HouseRentalController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 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 0344c12..68d0f54 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);
}
@@ -93,13 +97,45 @@
}
/**
+ * 出租屋 自定义新增
+ */
+ @PostMapping("/add")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "自定义新增", notes = "传入houseRentalVo")
+ public R add(@RequestBody HouseRentalVO houseRentalVO) {
+ return R.status(houseRentalService.add(houseRentalVO));
+ }
+
+ /**
* 出租屋 修改
*/
@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));
+ }
+
+ /**
+ * 出租屋 自定义修改
+ * @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));
}
/**
@@ -122,5 +158,24 @@
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));
+ }
+
}
--
Gitblit v1.9.3