From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 04 七月 2025 17:56:41 +0800 Subject: [PATCH] git ch --- server/company/src/main/java/com/doumee/api/business/TaxesController.java | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 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 e491053..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,16 +96,24 @@ ExcelExporter.build(Taxes.class).export(taxesService.findPage(pageWrap).getRecords(), "鍙戠エ淇℃伅琛�", response); } - @ApiOperation("鑾峰彇浼佷笟淇℃伅") - @GetMapping("/getCompanyDetail") + + @ApiOperation("鏍规嵁ID鏌ヨ") + @GetMapping("/{id}") @RequiresPermissions("business:taxes:query") - public ApiResponse 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") @@ -126,7 +141,7 @@ @ApiOperation(value = "鑾峰彇鐩翠繚鏁版嵁淇℃伅",notes = "") @GetMapping("/getDirectTaxes") @RequiresPermissions("business:taxes:query") - public ApiResponse getDirectTaxes(@RequestParam Integer id) { + public ApiResponse<List<TaxesInvoicingVO>> getDirectTaxes(@RequestParam Integer id) { LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(!loginUserInfo.getType().equals(Constants.ONE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�"); -- Gitblit v1.9.3