Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

 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("新建")
@@ -84,6 +93,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 +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("同步成功");
    }
}