From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 4012529..a252c87 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -6,7 +6,9 @@
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
+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;
@@ -37,7 +39,11 @@
*/
@GetMapping("/getDept")
public AjaxResult getDept() {
- List<SysDept> sysDeptList =sysDeptService.selectDeptList(new SysDept());
+ Long userId = SecurityUtils.getUserId();
+ LoginUser user = SecurityUtils.getLoginUser();
+ Long[] deptIds = SecurityUtils.getDeptId();
+
+ List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
return AjaxResult.success(sysDeptList);
}
@@ -105,7 +111,7 @@
@DeleteMapping("/deleteIds")
@ApiOperation(value = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody List<Long> ids) {
+ public AjaxResult deleteIds(@RequestBody List<String> ids) {
if (ids == null || ids.size() == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -182,4 +188,14 @@
ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
util.exportExcel(response, accountExpenses, "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭");
}
+
+ @ApiOperation(value = "鐢ㄥ嵃瀹℃壒瀵煎嚭")
+ @PostMapping("/exportNine")
+ public void exportNine(HttpServletResponse response) {
+ List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getApproveType, 9));
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ util.exportExcel(response, accountExpenses, "鐢ㄥ嵃瀹℃壒瀵煎嚭");
+ }
}
--
Gitblit v1.9.3