Merge remote-tracking branch 'origin/master'

luohairen

2024-11-28 01f7b8b3baea652f29e534f78cdcae33bb1ae060

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

@@ -6,6 +6,7 @@
import com.ycl.common.group.Update;
import com.ycl.domain.form.ProjectPlanProgressReportForm;
import com.ycl.domain.query.ProjectPlanProgressReportQuery;
import com.ycl.domain.vo.ProgressReportResponseVO;
import com.ycl.service.ProjectPlanProgressReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -34,8 +35,8 @@

    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("hasAuthority('projectPlanProgressReport:add')")
    public Result add(@RequestBody @Validated(Add.class) ProjectPlanProgressReportForm form) {
//    @PreAuthorize("hasAuthority('projectPlanProgressReport:add')")
    public Result add(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) {
        return projectPlanProgressReportService.add(form);
    }

@@ -69,7 +70,7 @@

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