From 20d3e1da6517ed5e55ae3613ccbbb01f1b9eda2e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 25 四月 2026 11:53:11 +0800
Subject: [PATCH] fix(approve): 修复审批流程中的数据类型和业务逻辑问题
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 98 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 81 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 131f61e..b2c99c8 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -1,22 +1,23 @@
package com.ruoyi.approve.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.framework.security.LoginUser;
+import com.ruoyi.common.utils.poi.ExcelUtil;
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;
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
@@ -24,11 +25,8 @@
@Api(tags = "瀹℃壒")
public class ApproveProcessController {
- @GetMapping("/test")
- public AjaxResult test() {
- System.out.println(1111);
- return AjaxResult.success("娴嬭瘯");
- }
+ @Autowired
+ private ISysDeptService sysDeptService;
@Autowired
@@ -39,11 +37,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);
}
@@ -111,11 +105,81 @@
@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<String> ids) {
+ if (ids == null || ids.size() == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
+
+ @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));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ 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));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ util.exportExcel(response, accountExpenses, "璇峰亣绠＄悊瀵煎嚭");
+ }
+
+ @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));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ 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));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ util.exportExcel(response, accountExpenses, "鎶ラ攢绠＄悊瀵煎嚭");
+ }
+
+ @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));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ 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));
+ 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