From 26b93e84d4153039ef3600355308d2a743dc3be7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 23 十二月 2024 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
index b5a5677..2efd887 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java
@@ -37,7 +37,7 @@
@Autowired
private CompanyService companyService;
- @Autowired
+// @Autowired
private ERPSyncService erpSyncService;
@Autowired
private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@@ -55,6 +55,22 @@
return ApiResponse.success(companyService.create(company));
}
+ @PreventRepeat
+ @ApiOperation("鍒涘缓璐㈠姟鍏徃")
+ @PostMapping("/createFinanceCompany")
+ @CloudRequiredPermission("business:company:create")
+ public ApiResponse<Integer> createFinanceCompany(@RequestBody Company company, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ company.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(companyService.createFinanceCompany(company));
+ }
+ @PreventRepeat
+ @ApiOperation("鏇存柊璐㈠姟鍏徃")
+ @PostMapping("/updateFinanceCompany")
+ @CloudRequiredPermission("business:company:update")
+ public ApiResponse<Integer> updateFinanceCompany(@RequestBody Company company, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ company.setLoginUserInfo(this.getLoginUser(token));
+ return ApiResponse.success(companyService.updateFinanceCompany(company));
+ }
@PreventRepeat
@ApiOperation("鍒涘缓鍔冲姟鍏徃")
@PostMapping("/createLaborServices")
@@ -135,6 +151,7 @@
@PostMapping("/updateStatusById")
@CloudRequiredPermission("business:company:update")
public ApiResponse updateStatusById(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ company.setLoginUserInfo(getLoginUser(token));
companyService.updateStatusById(company);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3