From 12f73bafbe361f78d68a35de83ca3b3b4d4e0224 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 二月 2025 16:27:43 +0800
Subject: [PATCH] 查询待办任务时，判断是否挂起状态
---
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 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..4111cb5 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;
@@ -70,7 +71,7 @@
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
@PreAuthorize("hasAuthority('projectPlanExamineRecord:detail')")
- public Result detail(@PathVariable("id") Integer id) {
+ public Result detail(@PathVariable("id") Long id) {
return projectPlanExamineRecordService.detail(id);
}
@@ -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