From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

---
 src/main/java/com/ruoyi/projectManagement/controller/InfoController.java |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
index 23af4cc..ed44f79 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
@@ -1,16 +1,21 @@
 package com.ruoyi.projectManagement.controller;
 
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.projectManagement.dto.InfoStageDto;
+import com.ruoyi.projectManagement.dto.UpdateStateInfo;
 import com.ruoyi.projectManagement.service.InfoService;
+import com.ruoyi.projectManagement.service.impl.handle.InfoStageHandleService;
+import com.ruoyi.projectManagement.vo.SaveInfoStageVo;
 import com.ruoyi.projectManagement.vo.SaveInfoVo;
-import io.swagger.annotations.Api;
+import com.ruoyi.projectManagement.vo.SearchInfoVo;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * @author buhuazhen
@@ -19,15 +24,71 @@
  */
 @RestController
 @RequestMapping("/projectManagement/info")
-@Api(value = "InfoController", tags = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
+@Tag(name = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
 @RequiredArgsConstructor
 public class InfoController {
 
     private final InfoService infoService;
+    private final InfoStageHandleService infoStageHandleService;
 
     @PostMapping("/save")
+    @Operation(summary = "淇濆瓨")
+    @Log(title = "椤圭洰淇℃伅-淇濆瓨", businessType = BusinessType.INSERT)
     public AjaxResult save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
         infoService.save(saveInfoVo);
         return AjaxResult.success();
     }
+
+    @PostMapping("/updateStatus")
+    @Operation(summary = "淇敼鐘舵��")
+    @Log(title = "椤圭洰淇℃伅-淇敼鐘舵��", businessType = BusinessType.UPDATE)
+    public AjaxResult updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
+        infoService.updateStatus(updateStateInfo);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/delete/{id}")
+    @Operation(summary = "鍒犻櫎")
+    @Log(title = "椤圭洰淇℃伅-鍒犻櫎", businessType = BusinessType.DELETE)
+    public AjaxResult delete(@PathVariable Long id) {
+        infoService.deleteInfo(id);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/listPage")
+    @Operation(summary = "鍒嗛〉鍒楄〃")
+    public AjaxResult listPage(@RequestBody @Valid SearchInfoVo vo) {
+        return AjaxResult.success(infoService.searchListInfo(vo));
+    }
+
+
+    @PostMapping("/{id}")
+    @Operation(summary = "璇︽儏")
+    public AjaxResult getInfoById(@PathVariable Long id) {
+        return AjaxResult.success(infoService.getInfoById(id));
+    }
+
+    @PostMapping("/saveStage")
+    @Operation(summary = "淇濆瓨闃舵")
+    @Log(title = "椤圭洰淇℃伅-淇濆瓨闃舵", businessType = BusinessType.INSERT)
+    public AjaxResult saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
+        infoStageHandleService.save(dto);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/listStage/{id}")
+    @Operation(summary = "鍒楄〃闃舵")
+    public AjaxResult listStage(@PathVariable Long id) {
+        return AjaxResult.success(infoStageHandleService.getListVoByInfoId(id));
+    }
+
+    @PostMapping("/deleteStage/{id}")
+    @Operation(summary = "鍒犻櫎闃舵")
+    @Log(title = "椤圭洰淇℃伅-鍒犻櫎闃舵", businessType = BusinessType.DELETE)
+    public AjaxResult deleteStage(@PathVariable Long id) {
+        infoStageHandleService.deleteById(id);
+        return AjaxResult.success();
+    }
+
+
 }

--
Gitblit v1.9.3