From dd9cb79f149f2eaebccdf19efd35f77f5a9e52ae Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 00:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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..dc7f016 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
@@ -1,21 +1,20 @@
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.group.Add;
+import com.ycl.common.group.Update;
import com.ycl.domain.form.ProjectPlanExamineRecordForm;
import com.ycl.domain.query.ProjectPlanExamineRecordQuery;
+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,7 +26,7 @@
@RequiredArgsConstructor
@Api(value = "椤圭洰瀹℃牳璁板綍琛�", tags = "椤圭洰瀹℃牳璁板綍琛ㄧ鐞�")
@RestController
-@RequestMapping("/project-plan-examine-record")
+@RequestMapping("/api/project-plan-examine-record")
public class ProjectPlanExamineRecordController {
private final ProjectPlanExamineRecordService projectPlanExamineRecordService;
@@ -80,4 +79,14 @@
public Result list() {
return projectPlanExamineRecordService.all();
}
+
+ @GetMapping("/departmentApproval/{id}")
+ public Result departmentApproval(@PathVariable("id") Integer projectPlanRecordId) {
+ return projectPlanExamineRecordService.departmentApproval(projectPlanRecordId);
+ }
+
+ @GetMapping("/planLog/{id}")
+ public Result planLog(@PathVariable("id") Integer projectPlanRecordId) {
+ return projectPlanExamineRecordService.planLog(projectPlanRecordId);
+ }
}
--
Gitblit v1.8.0