From dc3cfa57c400ded43fdac3a73c7be27a18a90b23 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 28 三月 2024 15:57:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/business/TaxesController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 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 8ac43c2..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
@@ -10,8 +10,10 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.DirectInvoicingDTO;
import com.doumee.dao.business.dto.EntrustInvoicingDTO;
import com.doumee.dao.business.model.Taxes;
+import com.doumee.dao.business.vo.TaxesInvoicingVO;
import com.doumee.service.business.TaxesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -80,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")
@@ -87,22 +96,57 @@
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")
public ApiResponse entrustInvoicing(@RequestBody EntrustInvoicingDTO entrustInvoicingDTOs) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
taxesService.entrustInvoicing(entrustInvoicingDTOs);
return ApiResponse.success(null);
}
+ @ApiOperation("鎻愪氦鐩存墭鎶曟姤寮�绁�")
+ @PostMapping("/directInvoicing")
+ public ApiResponse directInvoicing(@RequestBody DirectInvoicingDTO directInvoicingDTO) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ taxesService.directInvoicing(directInvoicingDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation(value = "鑾峰彇鐩翠繚鏁版嵁淇℃伅",notes = "")
+ @GetMapping("/getDirectTaxes")
+ @RequiresPermissions("business:taxes:query")
+ 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(),"闈炰紒涓氱被鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+ }
+ return ApiResponse.success(taxesService.getDirectTaxes(id));
+ }
+
}
--
Gitblit v1.9.3