From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index dc6a64e..e9e411f 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -11,7 +11,8 @@
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.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -28,20 +29,20 @@
@RestController
@RequestMapping("/sealApplicationManagement")
@Tag(name = "鐢ㄥ嵃鐢宠绠＄悊")
-public class SealApplicationManagementController {
+public class SealApplicationManagementController extends BaseController {
private SealApplicationManagementService sealApplicationManagementService;
private ISysNoticeService sysNoticeService;
private FileUtil fileUtil;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
- return AjaxResult.success(sealApplicationManagementService.listPage(page,sealApplicationManagement));
+ public R<?> listPage(Page page, SealApplicationManagement sealApplicationManagement){
+ return R.ok(sealApplicationManagementService.listPage(page,sealApplicationManagement));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
+ public R<?> add(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
sealApplicationManagementService.save(sealApplicationManagement);
// 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE,
@@ -54,30 +55,30 @@
+"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
Arrays.asList(sealApplicationManagement.getApproveUserId()),
"/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
+ public R<?> update(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
// 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE,
RecordTypeEnum.SEAL_APPLICATION_MANAGEMENT,
sealApplicationManagement.getId(),
sealApplicationManagement.getStorageBlobDTOs());
- return AjaxResult.success(sealApplicationManagementService.updateById(sealApplicationManagement));
+ return R.ok(sealApplicationManagementService.updateById(sealApplicationManagement));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@PathVariable("ids") List<Long> ids){
+ public R<?> delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum.FILE,
RecordTypeEnum.SEAL_APPLICATION_MANAGEMENT,
ids);
- return AjaxResult.success(sealApplicationManagementService.removeBatchByIds(ids));
+ return R.ok(sealApplicationManagementService.removeBatchByIds(ids));
}
@Operation(summary = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
--
Gitblit v1.9.3