From 0cc80c49603bb63b6ff348e5743cb5bb4801de7a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 13:46:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index 41cca71..1f64cf3 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -73,7 +73,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:company:update")
public ApiResponse updateById(@RequestBody Company company) {
- companyService.updateById(company);
+ companyService.updateLaborServicesById(company);
return ApiResponse.success(null);
}
@@ -82,6 +82,15 @@
@RequiresPermissions("business:company:query")
public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
return ApiResponse.success(companyService.findPage(pageWrap));
+ }
+
+
+ @ApiOperation("淇敼鐘舵��")
+ @PostMapping("/updateStatusById")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updateStatusById(@RequestBody Company company) {
+ companyService.updateStatusById(company);
+ return ApiResponse.success(null);
}
@ApiOperation("瀵煎嚭Excel")
@@ -122,4 +131,13 @@
return ApiResponse.success(companyService.findCompanyTreePage(type));
}
+
+
+ @ApiOperation("閮ㄩ棬淇℃伅鍚屾")
+ @PostMapping("/sync")
+// @RequiresPermissions("business:company:sync")
+ public ApiResponse sync(){
+ //TODO 鎵嬪姩鍚屾 閮ㄩ棬淇℃伅
+ return ApiResponse.success("鍚屾鎴愬姛");
+ }
}
--
Gitblit v1.9.3