Merge remote-tracking branch 'origin/master'

zxl

2025-03-21 c4ab6a24d2825f11a0de0f165667dc533c458a01

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

@@ -6,7 +6,7 @@
import com.ycl.common.group.Update;
import com.ycl.domain.form.ProgressPlanForm;
import com.ycl.domain.query.ProgressPlanQuery;
import com.ycl.domain.vo.ProjectProgressFileListsRequest;
import com.ycl.domain.form.ProjectProgressFileListsForm;
import com.ycl.mapper.FileMapper;
import com.ycl.service.ProgressPlanService;
import io.swagger.annotations.Api;
@@ -73,7 +73,7 @@
    @GetMapping("/{id}")
    @ApiOperation(value = "详情", notes = "详情")
//    @PreAuthorize("hasAuthority('progressPlan:detail')")
    public Result detail(@PathVariable("id") Integer id) {
    public Result detail(@PathVariable("id") Long id) {
        return progressPlanService.detail(id);
    }

@@ -85,12 +85,12 @@
    }

    @PostMapping("/saveProjectProgressFileLists")
    public Result saveProjectProgressFileLists(@RequestBody ProjectProgressFileListsRequest request) {
        return progressPlanService.saveProjectProgressFileLists(request);
    public Result saveProjectProgressFileLists(@RequestBody ProjectProgressFileListsForm form) {
        return progressPlanService.saveProjectProgressFileLists(form);
    }

    @GetMapping("/getProjectProgressForm/{id}")
    public Result getProjectProgressForm(@PathVariable("id") Integer id) {
    public Result getProjectProgressForm(@PathVariable("id") Long id) {
        return progressPlanService.getProjectProgressForm(id);
    }