From 0005d49a697ce934c6fc2a61ecb75d881b9a76f2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:48:31 +0800
Subject: [PATCH] feat(production): 完善生产订单管理功能
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 6fb9986..0699a79 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
@@ -14,28 +13,20 @@
import com.ruoyi.project.system.domain.SysDept;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.ParseException;
import java.util.List;
@RestController
@RequestMapping("/approveProcess")
+@AllArgsConstructor
@Api(tags = "瀹℃壒")
public class ApproveProcessController {
- @GetMapping("/test")
- public AjaxResult test() {
- System.out.println(1111);
- return AjaxResult.success("娴嬭瘯");
- }
-
-
- @Autowired
private IApproveProcessService approveProcessService;
/**銆�
* 鑾峰彇閮ㄩ棬鍒楄〃
@@ -115,8 +106,8 @@
@DeleteMapping("/deleteIds")
@ApiOperation(value = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody Long[] ids) {
- if (ids == null || ids.length == 0) {
+ public AjaxResult deleteIds(@RequestBody List<Long> ids) {
+ if (ids == null || ids.size() == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
@@ -182,4 +173,14 @@
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
util.exportExcel(response, accountExpenses, "鍗忓悓瀹℃壒瀵煎嚭");
}
+
+ @ApiOperation(value = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭")
+ @PostMapping("/exportEight")
+ public void exportEight(HttpServletResponse response) {
+ List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getApproveType, 8));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ util.exportExcel(response, accountExpenses, "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭");
+ }
}
--
Gitblit v1.9.3