From 98c18b07b92f80a1885e56b3413068644d0c9a51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 03 一月 2025 16:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
index 4f4652f..5cd3961 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
@@ -6,6 +6,7 @@
import com.ycl.common.group.Update;
import com.ycl.domain.form.ProjectPlanExamineRecordForm;
import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
+import com.ycl.domain.form.ProgressReportResponseForm;
import com.ycl.service.ProjectPlanExamineRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -82,12 +83,12 @@
}
@GetMapping("/departmentApproval/{id}")
- public Result departmentApproval(@PathVariable("id") Integer projectPlanRecordId) {
+ public Result departmentApproval(@PathVariable("id") Long projectPlanRecordId) {
return projectPlanExamineRecordService.departmentApproval(projectPlanRecordId);
}
@GetMapping("/planLog/{id}")
- public Result planLog(@PathVariable("id") Integer projectPlanRecordId) {
+ public Result planLog(@PathVariable("id") Long projectPlanRecordId) {
return projectPlanExamineRecordService.planLog(projectPlanRecordId);
}
@@ -108,4 +109,8 @@
return projectPlanExamineRecordService.todoList(getUserId(),query);
}
+ @PostMapping("/reply")
+ public Result reply(@RequestBody ProgressReportResponseForm form) {
+ return projectPlanExamineRecordService.reply(form);
+ }
}
--
Gitblit v1.8.0