From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

---
 src/main/java/com/ruoyi/projectManagement/controller/InfoController.java |   67 +++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
index 85a7070..1acbd65 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
@@ -1,16 +1,20 @@
 package com.ruoyi.projectManagement.controller;
 
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+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 com.ruoyi.projectManagement.vo.SearchInfoVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * @author buhuazhen
@@ -19,44 +23,65 @@
  */
 @RestController
 @RequestMapping("/projectManagement/info")
-@Api(value = "InfoController", tags = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
+@Tag(name = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
 @RequiredArgsConstructor
-public class InfoController {
+public class InfoController extends BaseController {
 
     private final InfoService infoService;
+    private final InfoStageHandleService infoStageHandleService;
 
     @PostMapping("/save")
-    @ApiOperation("淇濆瓨")
-    public AjaxResult save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
+    @Operation(summary = "淇濆瓨")
+    public R<?> save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
         infoService.save(saveInfoVo);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     @PostMapping("/updateStatus")
-    @ApiOperation("淇敼鐘舵��")
-    public AjaxResult updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
+    @Operation(summary = "淇敼鐘舵��")
+    public R<?> updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
         infoService.updateStatus(updateStateInfo);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     @PostMapping("/delete/{id}")
-    @ApiOperation("鍒犻櫎")
-    public AjaxResult delete(@PathVariable Long id) {
+    @Operation(summary = "鍒犻櫎")
+    public R<?> delete(@PathVariable Long id) {
         infoService.deleteInfo(id);
-        return AjaxResult.success();
+        return R.ok();
     }
 
     @PostMapping("/listPage")
-    @ApiOperation("鍒嗛〉鍒楄〃")
-    public AjaxResult listPage(@RequestBody @Valid SearchInfoVo vo) {
-        return AjaxResult.success(infoService.searchListInfo(vo));
+    @Operation(summary = "鍒嗛〉鍒楄〃")
+    public R<?> listPage(@RequestBody @Valid SearchInfoVo vo) {
+        return R.ok(infoService.searchListInfo(vo));
     }
 
 
     @PostMapping("/{id}")
-    @ApiOperation("璇︽儏")
-    public AjaxResult getInfoById(@PathVariable Long id) {
-        return AjaxResult.success(infoService.getInfoById(id));
+    @Operation(summary = "璇︽儏")
+    public R<?> getInfoById(@PathVariable Long id) {
+        return R.ok(infoService.getInfoById(id));
+    }
+
+    @PostMapping("/saveStage")
+    @Operation(summary = "淇濆瓨闃舵")
+    public R<?> saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
+        infoStageHandleService.save(dto);
+        return R.ok();
+    }
+
+    @PostMapping("/listStage/{id}")
+    @Operation(summary = "鍒楄〃闃舵")
+    public R<?> listStage(@PathVariable Long id) {
+        return R.ok(infoStageHandleService.getListVoByInfoId(id));
+    }
+
+    @PostMapping("/deleteStage/{id}")
+    @Operation(summary = "鍒犻櫎闃舵")
+    public R<?> deleteStage(@PathVariable Long id) {
+        infoStageHandleService.deleteById(id);
+        return R.ok();
     }
 
 

--
Gitblit v1.9.3