From 3e76171990be40e226341da1cd7c2d159c9a3b70 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 02 二月 2024 18:11:31 +0800
Subject: [PATCH] 111

---
 server/company/src/main/java/com/doumee/api/business/TaxesController.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/business/TaxesController.java b/server/company/src/main/java/com/doumee/api/business/TaxesController.java
index bc5bcdf..b1828b6 100644
--- a/server/company/src/main/java/com/doumee/api/business/TaxesController.java
+++ b/server/company/src/main/java/com/doumee/api/business/TaxesController.java
@@ -82,6 +82,13 @@
         return ApiResponse.success(taxesService.findPageForCompany(pageWrap));
     }
 
+    @ApiOperation("鍒楄〃鏌ヨ")
+    @PostMapping("/list")
+    @RequiresPermissions("business:taxes:query")
+    public ApiResponse<List<Taxes>> findList (@RequestBody Taxes taxes) {
+        return ApiResponse.success(taxesService.findListForCompany(taxes));
+    }
+
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:taxes:exportExcel")
@@ -89,17 +96,25 @@
         ExcelExporter.build(Taxes.class).export(taxesService.findPage(pageWrap).getRecords(), "鍙戠エ淇℃伅琛�", response);
     }
 
-    @ApiOperation("鑾峰彇浼佷笟淇℃伅")
-    @GetMapping("/getCompanyDetail")
+
+    @ApiOperation("鏍规嵁ID鏌ヨ")
+    @GetMapping("/{id}")
     @RequiresPermissions("business:taxes:query")
-    public ApiResponse<Taxes> getCompanyDetail() {
-        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        if(!loginUserInfo.getType().equals(Constants.ONE)){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
-        }
-        return ApiResponse.success(taxesService.findById(loginUserInfo.getCompanyId()));
+    public ApiResponse<Taxes> findById(@PathVariable Integer id) {
+        return ApiResponse.success(taxesService.findById(id));
     }
 
+//    @ApiOperation("鑾峰彇浼佷笟淇℃伅")
+//    @GetMapping("/getCompanyDetail")
+//    @RequiresPermissions("business:taxes:query")
+//    public ApiResponse<Taxes> getCompanyDetail() {
+//        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+//        if(!loginUserInfo.getType().equals(Constants.ONE)){
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+//        }
+//        return ApiResponse.success(taxesService.findById(loginUserInfo.getCompanyId()));
+//    }
+
     @ApiOperation("鎻愪氦濮旀墭鎶曟姤寮�绁�")
     @PostMapping("/entrustInvoicing")
     public ApiResponse entrustInvoicing(@RequestBody EntrustInvoicingDTO entrustInvoicingDTOs) {

--
Gitblit v1.9.3