From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/business/CompanyController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/CompanyController.java b/server/company/src/main/java/com/doumee/api/business/CompanyController.java
index 643b271..647fcd8 100644
--- a/server/company/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/company/src/main/java/com/doumee/api/business/CompanyController.java
@@ -3,6 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
@@ -36,7 +38,8 @@
@PostMapping("/create")
@RequiresPermissions("business:company:create")
public ApiResponse create(@RequestBody Company company) {
- return ApiResponse.success(companyService.create(company));
+ companyService.create(company);
+ return ApiResponse.success(null);
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -65,21 +68,14 @@
@RequiresPermissions("business:company:update")
public ApiResponse updateById(@RequestBody Company company) {
companyService.updateById(company);
+ companyService.startSignAuth(company.getId());
return ApiResponse.success(null);
}
-
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:company:query")
public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
//鏉冮檺鑼冨洿鍐�
- return ApiResponse.success(companyService.findPage(pageWrap));
- }
- @ApiOperation("鏌ヨ鍏ㄩ儴鏁版嵁(璐﹀彿鍒嗛厤浼佷笟浣跨敤)")
- @PostMapping("/pageAll")
- @RequiresPermissions("business:companypermission:create")
- public ApiResponse<PageData<Company>> findPageAll (@RequestBody PageWrap<Company> pageWrap) {
- pageWrap.getModel().setQueryFlag(Constants.ONE);//鏌ヨ鍏ㄩ儴
return ApiResponse.success(companyService.findPage(pageWrap));
}
@@ -93,7 +89,18 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:company:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse<Company> findById(@PathVariable Integer id) {
+
return ApiResponse.success(companyService.findById(id));
}
+
+ @ApiOperation("浼佷笟璇佷欢涓嬭浇")
+ @PostMapping("/exportFiles")
+ @RequiresPermissions("business:company:exportExcel")
+ public void exportFiles(@RequestBody Company company,HttpServletResponse response) {
+ if(company.getId() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ companyService.exportFiles(company.getId(),response);
+ }
}
--
Gitblit v1.9.3