From 982e63b981079caaae2be3ad8bb11d29cf9cd97b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 24 十二月 2024 14:43:36 +0800
Subject: [PATCH] 驳回使用自带驳回，对已完成流程查看流程推进的处理
---
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
index 3c36314..5cd3961 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
@@ -1,21 +1,22 @@
package com.ycl.controller;
-import com.ycl.common.group.Update;
-import com.ycl.common.group.Add;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import javax.validation.constraints.NotEmpty;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.ycl.service.ProjectPlanExamineRecordService;
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.form.ProgressReportResponseForm;
+import com.ycl.service.ProjectPlanExamineRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
/**
* 椤圭洰瀹℃牳璁板綍琛� 鍓嶇鎺у埗鍣�
@@ -27,8 +28,8 @@
@RequiredArgsConstructor
@Api(value = "椤圭洰瀹℃牳璁板綍琛�", tags = "椤圭洰瀹℃牳璁板綍琛ㄧ鐞�")
@RestController
-@RequestMapping("/project-plan-examine-record")
-public class ProjectPlanExamineRecordController {
+@RequestMapping("/api/project-plan-examine-record")
+public class ProjectPlanExamineRecordController extends BaseController {
private final ProjectPlanExamineRecordService projectPlanExamineRecordService;
@@ -80,4 +81,36 @@
public Result list() {
return projectPlanExamineRecordService.all();
}
+
+ @GetMapping("/departmentApproval/{id}")
+ public Result departmentApproval(@PathVariable("id") Long projectPlanRecordId) {
+ return projectPlanExamineRecordService.departmentApproval(projectPlanRecordId);
+ }
+
+ @GetMapping("/planLog/{id}")
+ public Result planLog(@PathVariable("id") Long projectPlanRecordId) {
+ return projectPlanExamineRecordService.planLog(projectPlanRecordId);
+ }
+
+ @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 ProgressReportResponseForm form) {
+ return projectPlanExamineRecordService.reply(form);
+ }
}
--
Gitblit v1.8.0