From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug

---
 server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 57 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..94d7245 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
@@ -1,19 +1,26 @@
 package com.doumee.api.business;
 
 import com.doumee.api.BaseController;
+import com.doumee.config.DataSyncConfig;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
 import com.doumee.core.model.ApiResponse;
 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.service.business.CompanyService;
+import com.doumee.service.business.ext.ERPSyncService;
+import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
 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 +38,13 @@
 
     @Autowired
     private CompanyService companyService;
+
+    @Autowired
+    private ERPSyncService erpSyncService;
+    @Autowired
+    private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
+    @Autowired
+    private DataSyncConfig dataSyncConfig;
 
     @PreventRepeat
     @ApiOperation("鏂板缓")
@@ -84,6 +98,34 @@
         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")
+    @RequiresPermissions("business:company:update")
+    public ApiResponse updateStatusById(@RequestBody Company company) {
+        companyService.updateStatusById(company);
+        return ApiResponse.success(null);
+    }
+
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:company:exportExcel")
@@ -117,9 +159,23 @@
      */
     @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("/syncAll")
+    @RequiresPermissions("business:company:sync")
+    public ApiResponse sync(){
+        if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
+            return ApiResponse.success( erpSyncService.syncCompany(null));
+        }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
+             hkSyncOrgUserFHKService.syncOrgData();
+            return ApiResponse.success("鍚屾鎴愬姛");
+        }
+        return ApiResponse.failed("鏃犳晥鎿嶄綔");
+    }
 }

--
Gitblit v1.9.3