Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-04-09 71e2d06dfa28d3bd60b0d9fa6d6c7ff32884a1a9

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

@@ -3,6 +3,8 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
@@ -36,7 +38,8 @@
    @PostMapping("/create")
    @RequiresPermissions("business:company:create")
    public ApiResponse create(@RequestBody Company company) {
        return ApiResponse.success(companyService.create(company));
        companyService.create(company);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID删除")
@@ -65,21 +68,14 @@
    @RequiresPermissions("business:company:update")
    public ApiResponse updateById(@RequestBody Company company) {
        companyService.updateById(company);
        companyService.startSignAuth(company.getId());
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:company:query")
    public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
        //权限范围内
        return ApiResponse.success(companyService.findPage(pageWrap));
    }
    @ApiOperation("查询全部数据(账号分配企业使用)")
    @PostMapping("/pageAll")
    @RequiresPermissions("business:companypermission:create")
    public ApiResponse<PageData<Company>> findPageAll (@RequestBody PageWrap<Company> pageWrap) {
        pageWrap.getModel().setQueryFlag(Constants.ONE);//查询全部
        return ApiResponse.success(companyService.findPage(pageWrap));
    }

@@ -93,7 +89,18 @@
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:company:query")
    public ApiResponse findById(@PathVariable Integer id) {
    public ApiResponse<Company> findById(@PathVariable Integer id) {

        return ApiResponse.success(companyService.findById(id));
    }

    @ApiOperation("企业证件下载")
    @PostMapping("/exportFiles")
    @RequiresPermissions("business:company:exportExcel")
    public void exportFiles(@RequestBody Company company,HttpServletResponse response) {
        if(company.getId() == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        companyService.exportFiles(company.getId(),response);
    }
}