From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index a9d8f75..929a17a 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.service.SalesQuotationService;
import jakarta.servlet.http.HttpServletResponse;
@@ -14,14 +15,15 @@
@RestController
@RequestMapping("/sales/quotation")
@AllArgsConstructor
-public class SalesQuotationController extends BaseController {
+public class SalesQuotationController {
private final SalesQuotationService salesQuotationService;
@GetMapping("/list")
- public R<?> getList(Page page, SalesQuotationDto salesQuotationDto) {
- return R.ok(salesQuotationService.listPage(page, salesQuotationDto));
+ public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
+ return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
}
+ @Log(title = "閿�鍞姤浠�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
@@ -32,16 +34,19 @@
}
+ @Log(title = "閿�鍞姤浠�", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public R<?> add(@RequestBody SalesQuotationDto salesQuotationDto) {
- return R.ok(salesQuotationService.add(salesQuotationDto));
+ public AjaxResult add(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return AjaxResult.success(salesQuotationService.add(salesQuotationDto));
}
+ @Log(title = "閿�鍞姤浠�", businessType = BusinessType.UPDATE)
@PostMapping("/update")
- public R<?> update(@RequestBody SalesQuotationDto salesQuotationDto) {
- return R.ok(salesQuotationService.edit(salesQuotationDto));
+ public AjaxResult update(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return AjaxResult.success(salesQuotationService.edit(salesQuotationDto));
}
+ @Log(title = "閿�鍞姤浠�", businessType = BusinessType.DELETE)
@DeleteMapping("/delete")
- public R<?> delete(@RequestBody Long id) {
- return R.ok(salesQuotationService.delete(id));
+ public AjaxResult delete(@RequestBody Long id) {
+ return AjaxResult.success(salesQuotationService.delete(id));
}
}
--
Gitblit v1.9.3