From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java
index 567c836..d412d4d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.YwBuilding;
import com.doumee.dao.business.model.YwContractRoom;
import com.doumee.service.business.YwContractRoomService;
import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:ywcontractroom:create")
public ApiResponse create(@RequestBody YwContractRoom ywContractRoom,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContractRoom.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractRoomService.create(ywContractRoom));
}
@@ -43,7 +45,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:ywcontractroom:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- ywContractRoomService.deleteById(id);
+ ywContractRoomService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -56,7 +58,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- ywContractRoomService.deleteByIdInBatch(idList);
+ ywContractRoomService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -64,6 +66,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:ywcontractroom:update")
public ApiResponse updateById(@RequestBody YwContractRoom ywContractRoom,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContractRoom.setLoginUserInfo(this.getLoginUser(token));
ywContractRoomService.updateById(ywContractRoom);
return ApiResponse.success(null);
}
@@ -72,6 +75,7 @@
@PostMapping("/page")
@CloudRequiredPermission("business:ywcontractroom:query")
public ApiResponse<PageData<YwContractRoom>> findPage (@RequestBody PageWrap<YwContractRoom> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractRoomService.findPage(pageWrap));
}
@@ -79,8 +83,26 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywcontractroom:exportExcel")
public void exportExcel (@RequestBody PageWrap<YwContractRoom> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
ExcelExporter.build(YwContractRoom.class).export(ywContractRoomService.findPage(pageWrap).getRecords(), "杩愮淮鍚堝悓鎴挎簮鍏宠仈淇℃伅琛�", response);
}
+ @ApiOperation("鏌ヨ鍒楄〃")
+ @PostMapping("/list")
+ @CloudRequiredPermission("business:ywcontractroom:query")
+ public ApiResponse<List<YwContractRoom>> findList (@RequestBody YwContractRoom pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(ywContractRoomService.findList(pageWrap));
+ }
+
+
+ @ApiOperation("鏌ヨ鍚堝悓鎴栬处鍗曟埧闂翠俊鎭�")
+ @PostMapping("/getContractRoom")
+ @CloudRequiredPermission("business:ywcontractroom:query")
+ public ApiResponse<List<YwContractRoom>> getContractRoom (@RequestBody YwContractRoom pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(ywContractRoomService.getContractRoom(pageWrap));
+ }
+
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
--
Gitblit v1.9.3