From b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 12 十二月 2024 16:03:27 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 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 c5f8ca7..b5a5677 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,5 +1,6 @@ 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; @@ -15,10 +16,8 @@ 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 com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl; +import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,6 +42,8 @@ @Autowired private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService; @Autowired + private HkSyncOrgUserFromSelfServiceImpl hkSyncOrgUserFromSelfService; + @Autowired private DataSyncConfig dataSyncConfig; @PreventRepeat @@ -58,7 +59,7 @@ @ApiOperation("鍒涘缓鍔冲姟鍏徃") @PostMapping("/createLaborServices") @CloudRequiredPermission("business:company:create") - public ApiResponse<Integer> createLaborServices(@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + public ApiResponse<Integer> createLaborServices(@RequestBody Company company, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ company.setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(companyService.createLaborServices(company)); } @@ -100,13 +101,23 @@ return ApiResponse.success(companyService.findPage(pageWrap)); } + @ApiOperation("缁勭粐鍒楄〃") + @PostMapping("/list") + @CloudRequiredPermission("business:company:query") + public ApiResponse<List<Company>> list (@RequestBody Company company,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + return ApiResponse.success(companyService.findList(company)); + } + + + @ApiOperation("缁勭粐鏍戞煡璇�") @GetMapping("/tree") @ApiImplicitParams({ - @ApiImplicitParam(name = "type", dataType = "Integer", value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐", required = true), + @ApiImplicitParam(name = "type", dataType = "Integer", value = "绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐 2鎸囧畾缁勭粐", required = true), }) @CloudRequiredPermission("business:company:query") - public ApiResponse<List<Company>> tree (@RequestParam(required=false) Integer type,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + public ApiResponse<List<Company>> tree (@RequestParam(required=false) Integer type, + @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ return ApiResponse.success(companyService.companyTree(type)); } @@ -171,11 +182,14 @@ @ApiOperation("鍏ㄩ噺閮ㄩ棬淇℃伅鍚屾") @PostMapping("/syncAll") @CloudRequiredPermission("business:company:sync") - public ApiResponse sync(){ + public ApiResponse sync(@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ 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(); + hkSyncOrgUserFHKService.syncOrgData(this.getLoginUser(token)); + return ApiResponse.success("鍚屾鎴愬姛"); + }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){ + hkSyncOrgUserFromSelfService.syncOrgData(this.getLoginUser(token)); return ApiResponse.success("鍚屾鎴愬姛"); } return ApiResponse.failed("鏃犳晥鎿嶄綔"); -- Gitblit v1.9.3