From 42ef653f816915dcdcc009d5717cf65135ac1fd8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 09 一月 2024 13:54:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 b3480ae..fd9872f 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
@@ -7,13 +7,19 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
+import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.service.business.CompanyService;
+import com.doumee.service.business.ERPSyncService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -31,6 +37,9 @@
@Autowired
private CompanyService companyService;
+
+ @Autowired
+ private ERPSyncService erpSyncService;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -73,7 +82,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:company:update")
public ApiResponse updateById(@RequestBody Company company) {
- companyService.updateLaborServicesById(company);
+ companyService.updateById(company);
return ApiResponse.success(null);
}
@@ -84,6 +93,25 @@
return ApiResponse.success(companyService.findPage(pageWrap));
}
+ @ApiOperation("缁勭粐鏍戞煡璇�")
+ @GetMapping("/tree")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "type", dataType = "Integer", value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", required = true),
+ })
+ @RequiresPermissions("business:company:query")
+ public ApiResponse<List<Company>> tree (@RequestParam Integer type) {
+ return ApiResponse.success(companyService.companyTree(type));
+ }
+
+
+ @ApiOperation("鎺掑簭")
+ @PostMapping("/updateSort")
+ @RequiresPermissions("business:company:query")
+ public ApiResponse updateSort (@Validated @RequestBody UpdateCompanySortDTO dto) {
+ companyService.updateSort(dto);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("淇敼鐘舵��")
@PostMapping("/updateStatusById")
@@ -92,6 +120,7 @@
companyService.updateStatusById(company);
return ApiResponse.success(null);
}
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:company:exportExcel")
@@ -125,9 +154,18 @@
*/
@ApiOperation("鏍规嵁绫诲瀷鏌ヨ缁勭粐淇℃伅")
@GetMapping("/findCompanyTreePage")
-// @RequiresPermissions("business:company:query")
+ @RequiresPermissions("business:company:query")
public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
return ApiResponse.success(companyService.findCompanyTreePage(type));
}
+
+
+ @ApiOperation("閮ㄩ棬淇℃伅鍚屾")
+ @PostMapping("/sync")
+ @RequiresPermissions("business:company:sync")
+ public ApiResponse sync(){
+ erpSyncService.syncCompany(null);
+ return ApiResponse.success("鍚屾鎴愬姛");
+ }
}
--
Gitblit v1.9.3