From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java b/business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java
index e573f3d..2e3fc9e 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanInfoController.java
@@ -4,10 +4,9 @@
import com.ycl.common.base.Result;
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
-import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.form.ProjectPlanInfoForm;
+import com.ycl.domain.form.ProjectPlanInfoRequestForm;
import com.ycl.domain.query.ProjectPlanInfoQuery;
-import com.ycl.domain.vo.ProjectPlanInfoRequest;
import com.ycl.service.ProjectPlanInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -72,7 +71,7 @@
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
// @PreAuthorize("hasAuthority('projectPlanInfo:detail')")
- public Result detail(@PathVariable("id") Integer id) {
+ public Result detail(@PathVariable("id") Long id) {
return projectPlanInfoService.detail(id);
}
@@ -85,8 +84,8 @@
@PostMapping("/addPlanInfo")
- public Result addPlanInfo(@RequestBody ProjectPlanInfoRequest request) {
- return projectPlanInfoService.addPlanInfo(request);
+ public Result addPlanInfo(@RequestBody @Validated ProjectPlanInfoRequestForm form) {
+ return projectPlanInfoService.addPlanInfo(form);
}
@PostMapping("/resubmitPlanInfo")
@@ -95,7 +94,7 @@
}
@PostMapping("/savePlanInfo/{planRecordId}")
- public Result savePlanInfo(@RequestBody ProjectPlanInfo item, @PathVariable("planRecordId") Integer planRecordId) {
+ public Result savePlanInfo(@RequestBody ProjectPlanInfoForm item, @PathVariable("planRecordId") Long planRecordId) {
return projectPlanInfoService.savePlanInfo(item, planRecordId);
}
--
Gitblit v1.8.0