From cea2ecb470537a52e6a17d09703a9f770b220cdf Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 05 十二月 2024 17:08:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
index 169c98f..099bf2d 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
@@ -1,10 +1,12 @@
package com.ycl.controller;
import com.ycl.common.base.Result;
+import com.ycl.common.core.controller.BaseController;
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
import com.ycl.domain.form.ProjectPlanExamineRecordForm;
import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
+import com.ycl.domain.vo.ProgressReportResponseVO;
import com.ycl.service.ProjectPlanExamineRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +29,7 @@
@Api(value = "椤圭洰瀹℃牳璁板綍琛�", tags = "椤圭洰瀹℃牳璁板綍琛ㄧ鐞�")
@RestController
@RequestMapping("/api/project-plan-examine-record")
-public class ProjectPlanExamineRecordController {
+public class ProjectPlanExamineRecordController extends BaseController {
private final ProjectPlanExamineRecordService projectPlanExamineRecordService;
@@ -90,8 +92,25 @@
return projectPlanExamineRecordService.planLog(projectPlanRecordId);
}
- @PostMapping("/replyDepartmentApproval")
- public Result replyDepartmentApproval(@RequestBody ProjectPlanExamineRecordForm form) {
- return projectPlanExamineRecordService.replyDepartmentApproval(form);
+ @PostMapping("/saveExamine")
+ public Result saveExamine(@RequestBody ProjectPlanExamineRecordForm form) {
+ return projectPlanExamineRecordService.saveExamine(form);
+ }
+
+ @PostMapping("/replyExamine")
+ public Result replyExamine(@RequestBody ProjectPlanExamineRecordForm form) {
+ return projectPlanExamineRecordService.replyExamine(form);
+ }
+
+ @GetMapping("/todo_list")
+// @PreAuthorize("hasAuthority('projectPlanExamineRecord:list')")
+ @ApiOperation(value = "杩涘害寰呭姙鍒楄〃", notes = "杩涘害寰呭姙鍒楄〃")
+ public Result todoList(ProjectPlanExamineRecordQuery query) {
+ return projectPlanExamineRecordService.todoList(getUserId(),query);
+ }
+
+ @PostMapping("/reply")
+ public Result reply(@RequestBody ProgressReportResponseVO form) {
+ return projectPlanExamineRecordService.reply(form);
}
}
--
Gitblit v1.8.0