Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

 server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
import com.doumee.service.business.CompanyService;
import io.swagger.annotations.Api;
@@ -39,6 +40,14 @@
        return ApiResponse.success(companyService.create(company));
    }

    @PreventRepeat
    @ApiOperation("创建劳务公司")
    @PostMapping("/createLaborServices")
    @RequiresPermissions("business:company:create")
    public ApiResponse<Integer> createLaborServices(@RequestBody Company company){
        return ApiResponse.success(companyService.createLaborServices(company));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:company:delete")
@@ -64,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);
    }

@@ -73,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")
@@ -99,4 +117,27 @@
        company.setCategoryId(query.getCategoryId());
        return ApiResponse.success(companyService.findList(company));
    }


    /**
     * 查询部门及其子部门信息
     * @param type 0 查询所有信息 1 查询内部信息
     * @return
     */
    @ApiOperation("根据类型查询组织信息")
    @GetMapping("/findCompanyTreePage")
//    @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(){
        //TODO 手动同步 部门信息
        return ApiResponse.success("同步成功");
    }
}