From 2b382a92207dfabf0eb30e743265df5c7c50e7bc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:27:45 +0800
Subject: [PATCH] feat(approve): 新增办公用品审批功能

---
 src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java |   48 ++++++++++++++++++++++++++++++------------------
 1 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
index 32318a7..eea52a0 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
@@ -1,55 +1,67 @@
 package com.ruoyi.technology.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.technology.bean.dto.TechnologyRoutingOperationDto;
+import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo;
 import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
 import com.ruoyi.technology.service.TechnologyRoutingOperationService;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.List;
 
 @RestController
 @RequestMapping("/technologyRoutingOperation")
-@Api(tags = "宸ヨ壓璺嚎宸ュ簭")
+@Tag(name = "宸ヨ壓璺嚎宸ュ簭")
+@RequiredArgsConstructor
 public class TechnologyRoutingOperationController {
 
-    @Autowired
-    private TechnologyRoutingOperationService technologyRoutingOperationService;
+    private final TechnologyRoutingOperationService technologyRoutingOperationService;
 
     @GetMapping("/page")
-    @ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒嗛〉鏌ヨ")
-    public R page(Page<TechnologyRoutingOperation> page, TechnologyRoutingOperation technologyRoutingOperation) {
-        return R.ok(technologyRoutingOperationService.pageTechnologyRoutingOperation(page, technologyRoutingOperation));
+    @Operation(summary = "宸ヨ壓璺嚎宸ュ簭鍒嗛〉鏌ヨ")
+    public R<IPage<TechnologyRoutingOperationVo>> page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
+        return R.ok(technologyRoutingOperationService.pageTechnologyRoutingOperation(page, technologyRoutingOperationDto));
     }
 
     @GetMapping("/list")
-    @ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒楄〃")
-    public R list(TechnologyRoutingOperation technologyRoutingOperation) {
-        return R.ok(technologyRoutingOperationService.listTechnologyRoutingOperation(technologyRoutingOperation));
+    @Operation(summary = "宸ヨ壓璺嚎宸ュ簭鍒楄〃")
+    public R<List<TechnologyRoutingOperationVo>> list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
+        return R.ok(technologyRoutingOperationService.listTechnologyRoutingOperation(technologyRoutingOperationDto));
     }
 
     @GetMapping("/{id}")
-    @ApiOperation("宸ヨ壓璺嚎宸ュ簭璇︽儏")
-    public R getInfo(@PathVariable("id") Long id) {
-        return R.ok(technologyRoutingOperationService.getById(id));
+    @Operation(summary = "宸ヨ壓璺嚎宸ュ簭璇︽儏")
+    public R<TechnologyRoutingOperationVo> getInfo(@PathVariable("id") Long id) {
+        return R.ok(technologyRoutingOperationService.getTechnologyRoutingOperationInfo(id));
     }
 
-    @PostMapping
-    @ApiOperation("鏂板宸ヨ壓璺嚎宸ュ簭")
+    @PostMapping("/add")
+    @Operation(summary = "鏂板宸ヨ壓璺嚎宸ュ簭")
     public R add(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
         return R.ok(technologyRoutingOperationService.saveTechnologyRoutingOperation(technologyRoutingOperation));
     }
 
     @PutMapping
-    @ApiOperation("淇敼宸ヨ壓璺嚎宸ュ簭")
+    @Operation(summary = "淇敼宸ヨ壓璺嚎宸ュ簭")
     public R edit(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
         return R.ok(technologyRoutingOperationService.updateById(technologyRoutingOperation));
     }
 
     @DeleteMapping("/{id}")
-    @ApiOperation("鍒犻櫎宸ヨ壓璺嚎宸ュ簭")
+    @Operation(summary = "鍒犻櫎宸ヨ壓璺嚎宸ュ簭")
     public R remove(@PathVariable("id") Long id) {
         return R.ok(technologyRoutingOperationService.removeTechnologyRoutingOperation(id));
     }
+
+    @PostMapping ("/sort")
+    @Operation(summary = "鎺掑簭宸ヨ壓璺嚎宸ュ簭")
+    public R sort(@RequestBody TechnologyRoutingOperation technologyRoutingOperation) {
+        return R.ok(technologyRoutingOperationService.sort(technologyRoutingOperation));
+    }
 }

--
Gitblit v1.9.3