From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 72 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 0699a79..5c2c09c 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -4,15 +4,17 @@
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.approve.bean.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.bean.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.common.constant.HttpStatus;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.domain.SysDept;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
@@ -24,8 +26,8 @@
@RestController
@RequestMapping("/approveProcess")
@AllArgsConstructor
-@Api(tags = "瀹℃壒")
-public class ApproveProcessController {
+@Tag(name = "瀹℃壒")
+public class ApproveProcessController extends BaseController {
private IApproveProcessService approveProcessService;
/**銆�
@@ -33,13 +35,13 @@
* @return
*/
@GetMapping("/getDept")
- public AjaxResult getDept() {
+ public R<?> getDept() {
Long userId = SecurityUtils.getUserId();
LoginUser user = SecurityUtils.getLoginUser();
Long[] deptIds = SecurityUtils.getDeptId();
List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
- return AjaxResult.success(sysDeptList);
+ return R.ok(sysDeptList);
}
/**
@@ -49,14 +51,14 @@
*/
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- @ApiOperation(value = "娣诲姞瀹℃壒")
- public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
+ @Operation(summary = "娣诲姞瀹℃壒")
+ public R<?> add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
if (approveProcessVO == null) {
- return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.addApprove(approveProcessVO);
- return AjaxResult.success("娣诲姞鎴愬姛");
+ return R.ok(null, "娣诲姞鎴愬姛");
}
/**
@@ -65,12 +67,12 @@
* @return
*/
@GetMapping("/get")
- @ApiOperation(value = "瀹℃壒璇︽儏")
- public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ @Operation(summary = "瀹℃壒璇︽儏")
+ public R<?> get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
- return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
}
- return AjaxResult.success(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
+ return R.ok(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
}
/**
@@ -80,22 +82,22 @@
*/
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
- @ApiOperation(value = "鏇存柊瀹℃壒")
- public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
+ @Operation(summary = "鏇存柊瀹℃壒")
+ public R<?> update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
if (approveGetAndUpdateVo == null) {
- return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.updateByApproveId(approveGetAndUpdateVo);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok(null, "鎿嶄綔鎴愬姛");
}
/**
* 鑾峰彇瀹℃壒鍒楄〃
* @return
*/
@GetMapping("/list")
- @ApiOperation(value = "鑾峰彇瀹℃壒鍒楄〃")
- public AjaxResult list(Page page, ApproveProcess approveProcess) {
- return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
+ @Operation(summary = "鑾峰彇瀹℃壒鍒楄〃")
+ public R<?> list(Page page, ApproveProcess approveProcess) {
+ return R.ok(approveProcessService.listAll(page, approveProcess));
}
/**
@@ -104,17 +106,17 @@
* @return
*/
@DeleteMapping("/deleteIds")
- @ApiOperation(value = "鍒犻櫎瀹℃壒")
+ @Operation(summary = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody List<Long> ids) {
+ public R<?> deleteIds(@RequestBody List<Long> ids) {
if (ids == null || ids.size() == 0) {
- return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok(null, "鎿嶄綔鎴愬姛");
}
- @ApiOperation(value = "鍏嚭绠＄悊瀵煎嚭")
+ @Operation(summary = "鍏嚭绠＄悊瀵煎嚭")
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -124,7 +126,7 @@
util.exportExcel(response, accountExpenses, "鍏嚭绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "璇峰亣绠＄悊瀵煎嚭")
+ @Operation(summary = "璇峰亣绠＄悊瀵煎嚭")
@PostMapping("/exportTwo")
public void exportTwo(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -134,7 +136,7 @@
util.exportExcel(response, accountExpenses, "璇峰亣绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "鍑哄樊绠＄悊瀵煎嚭")
+ @Operation(summary = "鍑哄樊绠＄悊瀵煎嚭")
@PostMapping("/exportThree")
public void exportThree(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -144,7 +146,7 @@
util.exportExcel(response, accountExpenses, "鍑哄樊绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "鎶ラ攢绠＄悊瀵煎嚭")
+ @Operation(summary = "鎶ラ攢绠＄悊瀵煎嚭")
@PostMapping("/exportFour")
public void exportFour(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -154,7 +156,7 @@
util.exportExcel(response, accountExpenses, "鎶ラ攢绠＄悊瀵煎嚭");
}
- @ApiOperation(value = "閲囪喘鐢宠瀵煎嚭")
+ @Operation(summary = "閲囪喘鐢宠瀵煎嚭")
@PostMapping("/exportFive")
public void exportFive(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -164,7 +166,7 @@
util.exportExcel(response, accountExpenses, "閲囪喘鐢宠瀵煎嚭");
}
- @ApiOperation(value = "鍗忓悓瀹℃壒瀵煎嚭")
+ @Operation(summary = "鍗忓悓瀹℃壒瀵煎嚭")
@PostMapping("/exportZero")
public void exportZero(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -174,7 +176,7 @@
util.exportExcel(response, accountExpenses, "鍗忓悓瀹℃壒瀵煎嚭");
}
- @ApiOperation(value = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭")
+ @Operation(summary = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭")
@PostMapping("/exportEight")
public void exportEight(HttpServletResponse response) {
List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
--
Gitblit v1.9.3