From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 5c2c09c..ed02564 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -9,9 +9,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -27,7 +25,7 @@
@RequestMapping("/approveProcess")
@AllArgsConstructor
@Tag(name = "瀹℃壒")
-public class ApproveProcessController extends BaseController {
+public class ApproveProcessController {
private IApproveProcessService approveProcessService;
/**銆�
@@ -35,13 +33,13 @@
* @return
*/
@GetMapping("/getDept")
- public R<?> getDept() {
+ public AjaxResult getDept() {
Long userId = SecurityUtils.getUserId();
LoginUser user = SecurityUtils.getLoginUser();
Long[] deptIds = SecurityUtils.getDeptId();
List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
- return R.ok(sysDeptList);
+ return AjaxResult.success(sysDeptList);
}
/**
@@ -52,13 +50,13 @@
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "娣诲姞瀹℃壒")
- public R<?> add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
+ public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
if (approveProcessVO == null) {
- return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.addApprove(approveProcessVO);
- return R.ok(null, "娣诲姞鎴愬姛");
+ return AjaxResult.success("娣诲姞鎴愬姛");
}
/**
@@ -68,11 +66,11 @@
*/
@GetMapping("/get")
@Operation(summary = "瀹℃壒璇︽儏")
- public R<?> get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
- return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
- return R.ok(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
+ return AjaxResult.success(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
}
/**
@@ -83,12 +81,12 @@
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "鏇存柊瀹℃壒")
- public R<?> update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
+ public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
if (approveGetAndUpdateVo == null) {
- return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.updateByApproveId(approveGetAndUpdateVo);
- return R.ok(null, "鎿嶄綔鎴愬姛");
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
}
/**
* 鑾峰彇瀹℃壒鍒楄〃
@@ -96,8 +94,8 @@
*/
@GetMapping("/list")
@Operation(summary = "鑾峰彇瀹℃壒鍒楄〃")
- public R<?> list(Page page, ApproveProcess approveProcess) {
- return R.ok(approveProcessService.listAll(page, approveProcess));
+ public AjaxResult list(Page page, ApproveProcess approveProcess) {
+ return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
}
/**
@@ -108,12 +106,12 @@
@DeleteMapping("/deleteIds")
@Operation(summary = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public R<?> deleteIds(@RequestBody List<Long> ids) {
+ public AjaxResult deleteIds(@RequestBody List<Long> ids) {
if (ids == null || ids.size() == 0) {
- return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+ return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
- return R.ok(null, "鎿嶄綔鎴愬姛");
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@Operation(summary = "鍏嚭绠＄悊瀵煎嚭")
--
Gitblit v1.9.3