Merge branch 'master' into dev

zxl

2025-03-03 f20fad8125774e487e133e909b323b43bd11db24

 business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java

@@ -5,6 +5,7 @@
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
import com.ycl.domain.form.ProjectPlanInfoForm;
import com.ycl.domain.form.ProjectPlanInfoRequestForm;
import com.ycl.domain.query.ProjectPlanInfoQuery;
import com.ycl.service.ProjectPlanInfoService;
import io.swagger.annotations.Api;
@@ -34,7 +35,7 @@

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("hasAuthority('projectPlanInfo:add')")
//    @PreAuthorize("hasAuthority('projectPlanInfo:add')")
    public Result add(@RequestBody @Validated(Add.class) ProjectPlanInfoForm form) {
        return projectPlanInfoService.add(form);
    }
@@ -69,8 +70,8 @@

    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
    @PreAuthorize("hasAuthority('projectPlanInfo:detail')")
    public Result detail(@PathVariable("id") Integer id) {
//    @PreAuthorize("hasAuthority('projectPlanInfo:detail')")
    public Result detail(@PathVariable("id") Long id) {
        return projectPlanInfoService.detail(id);
    }

@@ -80,4 +81,25 @@
    public Result list() {
        return projectPlanInfoService.all();
    }


    @PostMapping("/addPlanInfo")
    public Result addPlanInfo(@RequestBody @Validated ProjectPlanInfoRequestForm form) {
        return projectPlanInfoService.addPlanInfo(form);
    }

    @PostMapping("/resubmitPlanInfo")
    public Result resubmitPlanInfo(@RequestBody @Validated(Add.class) ProjectPlanInfoForm form) {
        return projectPlanInfoService.resubmitPlanInfo(form);
    }

    @PostMapping("/savePlanInfo/{planRecordId}")
    public Result savePlanInfo(@RequestBody ProjectPlanInfoForm item, @PathVariable("planRecordId") Long planRecordId) {
        return projectPlanInfoService.savePlanInfo(item, planRecordId);
    }

    @PostMapping("/delayPlanInfo")
    public Result delayPlanInfo(@RequestBody ProjectPlanInfoForm request) {
        return projectPlanInfoService.delayPlanInfo(request);
    }
}