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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 server/platform/src/main/java/com/doumee/api/business/SolutionsController.java

@@ -3,9 +3,12 @@
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;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Solutions;
import com.doumee.service.business.SolutionsService;
import io.swagger.annotations.Api;
@@ -17,6 +20,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
 * @author 江蹄蹄
@@ -81,6 +85,13 @@
    public ApiResponse<PageData<Solutions>> findPage (@RequestBody PageWrap<Solutions> pageWrap) {
        return ApiResponse.success(solutionsService.findPage(pageWrap));
    }
    @ApiOperation("查询全部")
    @PostMapping("/list")
    @RequiresPermissions("business:solutions:query")
    public ApiResponse<List<Solutions>> findList (@RequestBody  Solutions  pageWrap) {
        return ApiResponse.success(solutionsService.findList(pageWrap));
    }


    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
@@ -95,4 +106,20 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(solutionsService.findById(id));
    }

    @ApiOperation("查询企业可使用方案（已签署）")
    @GetMapping("/getUseList")
    @RequiresPermissions("business:solutions:query")
    public ApiResponse<List<Solutions>> getUseList (@RequestParam Integer companyId,Integer dateType) {
        if(Objects.isNull(companyId)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(Objects.isNull(dateType)){
            dateType = Constants.TWO;
        }
        List<Solutions>  solutionsList = solutionsService.findListByCompanyId(dateType,companyId);
        return ApiResponse.success(solutionsList);
    }


}