From 9ce28811e94fa042adb7cabe6581b0393c6d576d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 09 十二月 2024 18:17:11 +0800
Subject: [PATCH] ll

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java |   40 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
index 8241636..b1d01e4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java
@@ -9,6 +9,7 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.business.model.YwContract;
+import com.doumee.dao.business.model.YwContractBill;
 import com.doumee.service.business.YwContractService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,14 +38,31 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:ywcontract:create")
     public ApiResponse create(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywContract.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywContractService.create(ywContract));
+    }
+    @PreventRepeat
+    @ApiOperation("鏍规嵁鍙傛暟棰勭敓鎴愯处鍗曚俊鎭�")
+    @PostMapping("/getBillList")
+    @CloudRequiredPermission("business:ywcontract:create")
+    public ApiResponse< List<YwContractBill> > getBillList(@RequestBody YwContract ywContract, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywContract.setLoginUserInfo(this.getLoginUser(token));
+        return ApiResponse.success(ywContractService.getBillList(ywContract));
+    }
+    @PreventRepeat
+    @ApiOperation("閫�绉�")
+    @PostMapping("/backRent")
+    @CloudRequiredPermission("business:ywcontract:update")
+    public ApiResponse backRent(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywContract.setLoginUserInfo(this.getLoginUser(token));
+        return ApiResponse.success(ywContractService.backRent(ywContract));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:ywcontract:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        ywContractService.deleteById(id);
+        ywContractService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -57,7 +75,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        ywContractService.deleteByIdInBatch(idList);
+        ywContractService.deleteByIdInBatch(idList, this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -65,6 +83,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:ywcontract:update")
     public ApiResponse updateById(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywContract.setLoginUserInfo(this.getLoginUser(token));
         ywContractService.updateById(ywContract);
         return ApiResponse.success(null);
     }
@@ -73,13 +92,30 @@
     @PostMapping("/page")
     @CloudRequiredPermission("business:ywcontract:query")
     public ApiResponse<PageData<YwContract>> findPage (@RequestBody PageWrap<YwContract> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywContractService.findPage(pageWrap));
     }
+
+
+    @ApiOperation("鍒楄〃")
+    @PostMapping("/list")
+    @CloudRequiredPermission("business:ywcontract:query")
+    public ApiResponse<List<YwContract>> list (@RequestBody YwContract model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywContractService.findList(model));
+    }
+    @ApiOperation("鏍规嵁閫�绉熸棩鏈熸煡璇㈣处鍗曟暟鎹�")
+    @PostMapping("/findForBills")
+    @CloudRequiredPermission("business:ywcontract:query")
+    public ApiResponse<YwContract> findForBills (@RequestBody YwContract model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(ywContractService.findForBills(model));
+    }
+
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:ywcontract:exportExcel")
     public void exportExcel (@RequestBody PageWrap<YwContract> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         ExcelExporter.build(YwContract.class).export(ywContractService.findPage(pageWrap).getRecords(), "杩愮淮鍚堝悓淇℃伅琛�", response);
     }
 

--
Gitblit v1.9.3