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 | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index ed02564..5c2c09c 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -9,7 +9,9 @@
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.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -25,7 +27,7 @@
@RequestMapping("/approveProcess")
@AllArgsConstructor
@Tag(name = "瀹℃壒")
-public class ApproveProcessController {
+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);
}
/**
@@ -50,13 +52,13 @@
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "娣诲姞瀹℃壒")
- public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
+ 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, "娣诲姞鎴愬姛");
}
/**
@@ -66,11 +68,11 @@
*/
@GetMapping("/get")
@Operation(summary = "瀹℃壒璇︽儏")
- public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ 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()));
}
/**
@@ -81,12 +83,12 @@
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "鏇存柊瀹℃壒")
- public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
+ 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, "鎿嶄綔鎴愬姛");
}
/**
* 鑾峰彇瀹℃壒鍒楄〃
@@ -94,8 +96,8 @@
*/
@GetMapping("/list")
@Operation(summary = "鑾峰彇瀹℃壒鍒楄〃")
- public AjaxResult list(Page page, ApproveProcess approveProcess) {
- return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
+ public R<?> list(Page page, ApproveProcess approveProcess) {
+ return R.ok(approveProcessService.listAll(page, approveProcess));
}
/**
@@ -106,12 +108,12 @@
@DeleteMapping("/deleteIds")
@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, "鎿嶄綔鎴愬姛");
}
@Operation(summary = "鍏嚭绠＄悊瀵煎嚭")
--
Gitblit v1.9.3