From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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..42c3b1f 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
@@ -1,6 +1,5 @@
package com.doumee.cloud.admin;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.api.BaseController;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.annotation.CloudRequiredPermission;
@@ -37,7 +36,7 @@
@Autowired
private CompanyService companyService;
- @Autowired
+// @Autowired
private ERPSyncService erpSyncService;
@Autowired
private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@@ -55,6 +54,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")
@@ -107,6 +122,12 @@
public ApiResponse<List<Company>> list (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(companyService.findList(company));
}
+ @ApiOperation("鏂板缓鍚堝悓鎵�灞炲叕鍙哥瓫閫�")
+ @PostMapping("/listForConstract")
+ @CloudRequiredPermission("business:company:query")
+ public ApiResponse<List<Company>> listForConstract (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(companyService.listForConstract(company));
+ }
@@ -135,6 +156,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