From f8ef8d3f5f98eb06a6bda00c977351f3c2390285 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 25 四月 2026 10:11:40 +0800
Subject: [PATCH] refactor(approve): 重构部门查询逻辑并优化导入依赖
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index f44a3cd..111c3c0 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -2,16 +2,14 @@
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.bean.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
-import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
-import com.ruoyi.approve.vo.ApproveProcessVO;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,13 +18,15 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.ParseException;
import java.util.List;
@RestController
@RequestMapping("/approveProcess")
@Api(tags = "瀹℃壒")
public class ApproveProcessController {
+
+ @Autowired
+ private ISysDeptService sysDeptService;
@GetMapping("/test")
public AjaxResult test() {
@@ -43,11 +43,7 @@
*/
@GetMapping("/getDept")
public AjaxResult getDept() {
- Long userId = SecurityUtils.getUserId();
- LoginUser user = SecurityUtils.getLoginUser();
- Long[] deptIds = SecurityUtils.getDeptId();
-
- List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
+ List<SysDept> sysDeptList =sysDeptService.selectDeptList(new SysDept());
return AjaxResult.success(sysDeptList);
}
@@ -182,4 +178,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