From a856cfc04747d4d8f3605168531b253240d2e87c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 27 十一月 2024 08:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 73abf9f..9896571 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;
@@ -39,6 +40,14 @@
     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("閫�绉�")
@@ -87,6 +96,15 @@
         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("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:ywcontract:exportExcel")

--
Gitblit v1.9.3