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

k94314517

2024-05-08 0f409b25f91717e00e10c37738740b22583cb4ff

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

@@ -6,6 +6,7 @@
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 +18,7 @@

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

/**
 * @author 江蹄蹄
@@ -43,6 +45,14 @@
    @RequiresPermissions("business:solutions:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        solutionsService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("禁用启用")
    @PostMapping("/updateStatus")
    @RequiresPermissions("business:solutions:update")
    public ApiResponse updateStatus(@RequestBody Solutions solutions) {
        solutionsService.updateStatus(solutions);
        return ApiResponse.success(null);
    }

@@ -77,10 +87,21 @@
    @ApiOperation("列表查询")
    @PostMapping("/list")
    @RequiresPermissions("business:solutions:query")
    public ApiResponse<List<Solutions>> findList () {
        return ApiResponse.success(solutionsService.findListForCompany());
    public ApiResponse<List<Solutions>> findList (Solutions solutions) {
        Integer dateType = Constants.TWO;
        if(!Objects.isNull(solutions)&&!Objects.isNull(solutions.getDataType())){
            dateType = solutions.getDataType();
        }
        return ApiResponse.success(solutionsService.findListForCompany(dateType));
    }

    @ApiOperation("根据历史版本查询当前最新启用版本")
    @GetMapping("/getNewVersion")
    public ApiResponse<Solutions> getNewVersion (@RequestParam Integer solutionId) {
        return ApiResponse.success(solutionsService.getNewVersion(solutionId));
    }


//    @ApiOperation("列表查询")
//    @PostMapping("/page")
//    public ApiResponse<List<Solutions>> findPage (@RequestBody Solutions solutions) {