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/NoticeController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
index ba1df00..e3ef9b6 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
@@ -9,7 +9,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+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;
@@ -32,27 +32,27 @@
@GetMapping("/page")
@Log(title = "鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, NoticeDTO noticeDTO){
- return AjaxResult.success(noticeService.listPage(page, noticeDTO));
+ public R<?> listPage(Page page, NoticeDTO noticeDTO){
+ return R.ok(noticeService.listPage(page, noticeDTO));
}
@PostMapping("/add")
@Log(title = "鏂板", businessType = BusinessType.INSERT)
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody NoticeDTO noticeDTO){
+ public R<?> add(@RequestBody NoticeDTO noticeDTO){
if (noticeDTO.getStatus()==1){
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
sysNoticeService.simpleNoticeAll("閫氱煡鍏憡",
noticeDTO.getTitle(),
"/collaborativeApproval/noticeManagement?type="+noticeDTO.getType());
}
- return AjaxResult.success(noticeService.save(noticeDTO));
+ return R.ok(noticeService.save(noticeDTO));
}
@PutMapping("/update")
@Log(title = "淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody NoticeDTO noticeDTO){
+ public R<?> update(@RequestBody NoticeDTO noticeDTO){
if (ObjectUtils.isNotNull(noticeDTO.getStatus()) && noticeDTO.getStatus()==1){
Notice notice = noticeService.getById(noticeDTO.getId());
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
@@ -60,23 +60,23 @@
notice.getTitle(),
"/collaborativeApproval/noticeManagement?type="+notice.getType());
}
- return AjaxResult.success(noticeService.updateById(noticeDTO));
+ return R.ok(noticeService.updateById(noticeDTO));
}
@DeleteMapping("/{ids}")
@Log(title = "鍒犻櫎", businessType = BusinessType.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");
}
- return AjaxResult.success(noticeService.removeBatchByIds(ids));
+ return R.ok(noticeService.removeBatchByIds(ids));
}
@GetMapping("/count")
@Log(title = "鑾峰彇鍏憡鏁伴噺", businessType = BusinessType.OTHER)
@Operation(summary = "鑾峰彇鍏憡鏁伴噺")
- public AjaxResult count(){
- return AjaxResult.success(noticeService.selectCount());
+ public R<?> count(){
+ return R.ok(noticeService.selectCount());
}
}
--
Gitblit v1.9.3