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/collaborativeApproval/controller/SealApplicationManagementController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index e9e411f..dc6a64e 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -11,8 +11,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-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.service.ISysNoticeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -29,20 +28,20 @@
@RestController
@RequestMapping("/sealApplicationManagement")
@Tag(name = "鐢ㄥ嵃鐢宠绠＄悊")
-public class SealApplicationManagementController extends BaseController {
+public class SealApplicationManagementController {
private SealApplicationManagementService sealApplicationManagementService;
private ISysNoticeService sysNoticeService;
private FileUtil fileUtil;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public R<?> listPage(Page page, SealApplicationManagement sealApplicationManagement){
- return R.ok(sealApplicationManagementService.listPage(page,sealApplicationManagement));
+ public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
+ return AjaxResult.success(sealApplicationManagementService.listPage(page,sealApplicationManagement));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public R<?> add(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
+ public AjaxResult add(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
sealApplicationManagementService.save(sealApplicationManagement);
// 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE,
@@ -55,30 +54,30 @@
+"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
Arrays.asList(sealApplicationManagement.getApproveUserId()),
"/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
- return R.ok();
+ return AjaxResult.success();
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public R<?> update(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
+ public AjaxResult update(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
// 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE,
RecordTypeEnum.SEAL_APPLICATION_MANAGEMENT,
sealApplicationManagement.getId(),
sealApplicationManagement.getStorageBlobDTOs());
- return R.ok(sealApplicationManagementService.updateById(sealApplicationManagement));
+ return AjaxResult.success(sealApplicationManagementService.updateById(sealApplicationManagement));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public R<?> delete(@PathVariable("ids") List<Long> ids){
+ public AjaxResult delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum.FILE,
RecordTypeEnum.SEAL_APPLICATION_MANAGEMENT,
ids);
- return R.ok(sealApplicationManagementService.removeBatchByIds(ids));
+ return AjaxResult.success(sealApplicationManagementService.removeBatchByIds(ids));
}
@Operation(summary = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
--
Gitblit v1.9.3