From b24e024f386e7f25a071b58e9267a2c19f20ba1e Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 10 十二月 2024 18:11:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java b/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java
index 913fa2e..dc6aac4 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java
+++ b/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,9 +35,14 @@
@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);
+ }
+
+ @PostMapping("/examine")
+ public Result examine(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) {
+ return projectPlanProgressReportService.examine(form);
}
@PutMapping
@@ -69,7 +75,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);
}
--
Gitblit v1.8.0