From 8c8ff31cdca25f579d3c1f688f46c877bf28aaa1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 16:21:46 +0800
Subject: [PATCH] feat(approve): 重构审批流程配置功能

---
 src/main/java/com/ruoyi/production/controller/ProductProcessController.java |   60 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
index 234c307..ea01b69 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
@@ -3,22 +3,20 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.device.pojo.DeviceRepair;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.oA.pojo.OaProject;
 import com.ruoyi.production.dto.ProductProcessDto;
-import com.ruoyi.production.pojo.ProductProcess;
-import com.ruoyi.production.service.impl.ProductProcessServiceImpl;
+import com.ruoyi.production.dto.ProductProcessImportDto;
+import com.ruoyi.production.service.ProductProcessService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @RestController
@@ -26,9 +24,8 @@
 @RequestMapping("/productProcess")
 public class ProductProcessController extends BaseController {
 
-
     @Autowired
-    private ProductProcessServiceImpl productProcessService;
+    private ProductProcessService productProcessService;
 
     @GetMapping("/listPage")
     @Log(title = "宸ュ簭-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@@ -38,27 +35,50 @@
         return AjaxResult.success(listPage);
     }
 
-    @ApiModelProperty("鏂板宸ュ簭")
+    @ApiOperation("鏂板宸ュ簭")
     @PostMapping()
-    @Log(title = "鏂板", businessType = BusinessType.INSERT)
-    public AjaxResult add( @RequestBody ProductProcessDto productProcessDto) {
-        return productProcessService.add(productProcessDto);
+    @Log(title = "宸ュ簭-鏂板", businessType = BusinessType.INSERT)
+    public AjaxResult add(@RequestBody ProductProcessDto productProcessDto) {
+        productProcessService.add(productProcessDto);
+        return AjaxResult.success();
     }
 
     @ApiOperation("鏇存柊宸ュ簭")
-    @Log(title = "淇敼", businessType = BusinessType.UPDATE)
+    @Log(title = "宸ュ簭-淇敼", businessType = BusinessType.UPDATE)
     @PutMapping("/update")
-    public AjaxResult update(@RequestBody ProductProcess productProcess) {
-        return AjaxResult.success(productProcessService.updateById(productProcess));
+    public AjaxResult update(@RequestBody ProductProcessDto productProcessDto) {
+        productProcessService.update(productProcessDto);
+        return AjaxResult.success();
     }
 
     @ApiOperation("鍒犻櫎宸ュ簭")
     @DeleteMapping("/batchDelete")
-    @Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
+    @Log(title = "宸ュ簭-鍒犻櫎", businessType = BusinessType.DELETE)
     public AjaxResult batchDelete(@RequestBody List<Integer> ids) {
-        if(CollectionUtils.isEmpty(ids)){
-            return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
-        }
-        return AjaxResult.success(productProcessService.removeBatchByIds(ids));
+        productProcessService.batchDelete(ids);
+        return AjaxResult.success();
+    }
+
+    @ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
+    @GetMapping("/list")
+    @Log(title = "宸ュ簭-鏌ヨ鍒楄〃", businessType = BusinessType.OTHER)
+    public AjaxResult list() {
+        return AjaxResult.success(productProcessService.list());
+    }
+
+    @ApiOperation("瀵煎叆宸ュ簭")
+    @Log(title = "宸ュ簭-瀵煎叆", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) {
+        productProcessService.importData(file);
+        return AjaxResult.success();
+    }
+
+    @ApiOperation("涓嬭浇宸ュ簭妯℃澘")
+    @PostMapping("/downloadTemplate")
+    @Log(title = "宸ュ簭-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+    public void downloadTemplate(HttpServletResponse response) {
+        ExcelUtil<ProductProcessImportDto> util = new ExcelUtil<>(ProductProcessImportDto.class);
+        util.importTemplateExcel(response, "宸ュ簭妯℃澘");
     }
 }

--
Gitblit v1.9.3