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

k94314517

2025-05-29 e1c072109e62f4adcb53af0d2c69b896b9159059

 server/platform/src/main/java/com/doumee/api/business/SolutionsBaseController.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.dao.business.model.SolutionsBase;
import com.doumee.service.business.SolutionsBaseService;
@@ -18,6 +19,7 @@

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

/**
 * @author 江蹄蹄
@@ -64,7 +66,12 @@
    @PostMapping("/updateById")
    @RequiresPermissions("business:solutionsbase:update")
    public ApiResponse updateById(@RequestBody SolutionsBase solutionsBase) {
        solutionsBaseService.updateById(solutionsBase);
        if(Objects.isNull(solutionsBase.getSaveType())
        || Constants.equalsInteger(solutionsBase.getSaveType(),Constants.ZERO)){
            solutionsBaseService.updateById(solutionsBase);
        }else{
            solutionsBaseService.saveSolutionsRisk(solutionsBase);
        }
        return ApiResponse.success(null);
    }

@@ -106,4 +113,14 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(solutionsBaseService.findById(id));
    }



    @ApiOperation("测试生成主方案")
    @GetMapping("/createSolutionBase")
    public ApiResponse createSolutionBase(Integer solutionId) {
        solutionsBaseService.createSolutionBase(solutionId);
        return ApiResponse.success(null);
    }

}