From dc5e5c07549b493e21c11dc7929c32ea9fd732b0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:08:26 +0800
Subject: [PATCH] 协同办公系统模块优化
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 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..cc08b52 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;
@@ -20,7 +19,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.ParseException;
import java.util.List;
@RestController
@@ -115,7 +113,7 @@
@DeleteMapping("/deleteIds")
@ApiOperation(value = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody Long[] ids) {
+ public AjaxResult deleteIds(@RequestBody String[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -123,42 +121,34 @@
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
- @ApiOperation(value = "鍏嚭绠＄悊瀵煎嚭")
+ @ApiOperation(value = "鑷敱鍗忓悓瀹℃壒瀵煎嚭")
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
- List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
- .eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getApproveType, 1));
+ List<ApproveProcess> accountExpenses = exportList(1);
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
- util.exportExcel(response, accountExpenses, "鍏嚭绠＄悊瀵煎嚭");
+ util.exportExcel(response, accountExpenses, "鑷敱鍗忓悓瀹℃壒琛�");
}
@ApiOperation(value = "璇峰亣绠＄悊瀵煎嚭")
@PostMapping("/exportTwo")
public void exportTwo(HttpServletResponse response) {
- List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
- .eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getApproveType, 2));
+ List<ApproveProcess> accountExpenses = exportList(2);
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
util.exportExcel(response, accountExpenses, "璇峰亣绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "鍑哄樊绠＄悊瀵煎嚭")
+ @ApiOperation(value = "閿�鍞悎鍚屽鎵瑰鍑�")
@PostMapping("/exportThree")
public void exportThree(HttpServletResponse response) {
- List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
- .eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getApproveType, 3));
+ List<ApproveProcess> accountExpenses = exportList(3);
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
- util.exportExcel(response, accountExpenses, "鍑哄樊绠＄悊瀵煎嚭");
+ util.exportExcel(response, accountExpenses, "閿�鍞悎鍚屽鎵硅〃");
}
@ApiOperation(value = "鎶ラ攢绠＄悊瀵煎嚭")
@PostMapping("/exportFour")
public void exportFour(HttpServletResponse response) {
- List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
- .eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getApproveType, 4));
+ List<ApproveProcess> accountExpenses = exportList(4);
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
util.exportExcel(response, accountExpenses, "鎶ラ攢绠＄悊瀵煎嚭");
}
@@ -166,20 +156,37 @@
@ApiOperation(value = "閲囪喘鐢宠瀵煎嚭")
@PostMapping("/exportFive")
public void exportFive(HttpServletResponse response) {
- List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
- .eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getApproveType, 5));
+ List<ApproveProcess> accountExpenses = exportList(5);
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
- util.exportExcel(response, accountExpenses, "閲囪喘鐢宠瀵煎嚭");
+ util.exportExcel(response, accountExpenses, "閲囪喘璁″垝瀹℃壒琛�");
}
@ApiOperation(value = "鍗忓悓瀹℃壒瀵煎嚭")
@PostMapping("/exportZero")
public void exportZero(HttpServletResponse response) {
- List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
- .eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getApproveType, 0));
+ List<ApproveProcess> accountExpenses = exportList(1);
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
- util.exportExcel(response, accountExpenses, "鍗忓悓瀹℃壒瀵煎嚭");
+ util.exportExcel(response, accountExpenses, "鑷敱鍗忓悓瀹℃壒琛�");
+ }
+
+ @ApiOperation(value = "鎶ヤ环瀹℃壒瀵煎嚭")
+ @PostMapping("/exportSix")
+ public void exportSix(HttpServletResponse response) {
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<>(ApproveProcess.class);
+ util.exportExcel(response, exportList(6), "鎶ヤ环瀹℃壒琛�");
+ }
+
+ @ApiOperation(value = "鍑哄簱瀹℃壒瀵煎嚭")
+ @PostMapping("/exportSeven")
+ public void exportSeven(HttpServletResponse response) {
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<>(ApproveProcess.class);
+ util.exportExcel(response, exportList(7), "鍑哄簱瀹℃壒琛�");
+ }
+
+ private List<ApproveProcess> exportList(int type) {
+ return approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getApproveType, type)
+ .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()));
}
}
--
Gitblit v1.9.3