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 | 101 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 25fd122..cc08b52 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -1,19 +1,29 @@
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.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 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.util.List;
@RestController
@RequestMapping("/approveProcess")
+@Api(tags = "瀹℃壒")
public class ApproveProcessController {
@GetMapping("/test")
@@ -45,7 +55,9 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) {
+ @Transactional(rollbackFor = Exception.class)
+ @ApiOperation(value = "娣诲姞瀹℃壒")
+ public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
if (approveProcessVO == null) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -60,7 +72,8 @@
* @return
*/
@GetMapping("/get")
- public AjaxResult get(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ @ApiOperation(value = "瀹℃壒璇︽儏")
+ public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -73,7 +86,9 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) {
+ @Transactional(rollbackFor = Exception.class)
+ @ApiOperation(value = "鏇存柊瀹℃壒")
+ public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
if (approveGetAndUpdateVo == null) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -85,8 +100,9 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult list() {
- return AjaxResult.success(approveProcessService.listAll());
+ @ApiOperation(value = "鑾峰彇瀹℃壒鍒楄〃")
+ public AjaxResult list(Page page, ApproveProcess approveProcess) {
+ return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
}
/**
@@ -94,12 +110,83 @@
* @param ids
* @return
*/
- @PostMapping("/deleteIds")
- public AjaxResult deleteIds(@RequestBody Long[] ids) {
+ @DeleteMapping("/deleteIds")
+ @ApiOperation(value = "鍒犻櫎瀹℃壒")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult deleteIds(@RequestBody String[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
+
+ @ApiOperation(value = "鑷敱鍗忓悓瀹℃壒瀵煎嚭")
+ @PostMapping("/exportOne")
+ public void exportOne(HttpServletResponse response) {
+ List<ApproveProcess> accountExpenses = exportList(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 = exportList(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 = exportList(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 = exportList(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 = exportList(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 = exportList(1);
+ ExcelUtil<ApproveProcess> util = new ExcelUtil<ApproveProcess>(ApproveProcess.class);
+ 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