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/YwContractBillCloudController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
index 3fd42c7..0ee45de 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java
@@ -2,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -36,6 +37,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:ywcontractbill:create")
public ApiResponse create(@RequestBody YwContractBill ywContractBill,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContractBill.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractBillService.create(ywContractBill));
}
@@ -43,7 +45,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:ywcontractbill:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- ywContractBillService.deleteById(id);
+ ywContractBillService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -56,7 +58,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- ywContractBillService.deleteByIdInBatch(idList);
+ ywContractBillService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -64,6 +66,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:ywcontractbill:update")
public ApiResponse updateById(@RequestBody YwContractBill ywContractBill,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ ywContractBill.setLoginUserInfo(this.getLoginUser(token));
ywContractBillService.updateById(ywContractBill);
return ApiResponse.success(null);
}
@@ -72,13 +75,24 @@
@PostMapping("/page")
@CloudRequiredPermission("business:ywcontractbill:query")
public ApiResponse<PageData<YwContractBill>> findPage (@RequestBody PageWrap<YwContractBill> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(ywContractBillService.findPage(pageWrap));
}
+
+ @ApiOperation("鍙��娆捐处鍗�")
+ @PostMapping("/getCanBackBill")
+ @CloudRequiredPermission("business:ywcontractbill:query")
+ public ApiResponse<List<YwContractBill>> getCanBackBill (@RequestBody YwContractBill ywContractBill,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(ywContractBillService.getCanBackBill(ywContractBill));
+ }
+
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:ywcontractbill:exportExcel")
public void exportExcel (@RequestBody PageWrap<YwContractBill> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
ExcelExporter.build(YwContractBill.class).export(ywContractBillService.findPage(pageWrap).getRecords(), "杩愮淮鍚堝悓璐﹀崟淇℃伅琛�", response);
}
@@ -86,6 +100,17 @@
@GetMapping("/{id}")
@CloudRequiredPermission("business:ywcontractbill:query")
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- return ApiResponse.success(ywContractBillService.findById(id));
+ return ApiResponse.success(ywContractBillService.getDetail(id));
}
+
+
+ @LoginNoRequired
+ @ApiOperation("鐢熸垚璐﹀崟缂栧彿")
+ @GetMapping("/dealDayBillCode")
+ public ApiResponse dealDayBillCode() {
+ ywContractBillService.dealDayBillCode();
+ return ApiResponse.success("鐢熸垚鎴愬姛");
+ }
+
+
}
--
Gitblit v1.9.3