From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index 3a579d6..a9d8f75 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -1,33 +1,26 @@
package com.ruoyi.sales.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ruoyi.aftersalesservice.dto.AfterSalesServiceDto;
-import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-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.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.service.SalesQuotationService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
@RestController
@RequestMapping("/sales/quotation")
-public class SalesQuotationController {
- @Autowired
- private SalesQuotationService salesQuotationService;
+@AllArgsConstructor
+public class SalesQuotationController extends BaseController {
+ private final SalesQuotationService salesQuotationService;
@GetMapping("/list")
- public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
+ public R<?> getList(Page page, SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.listPage(page, salesQuotationDto));
}
+
@PostMapping("/export")
public void export(HttpServletResponse response) {
@@ -35,20 +28,20 @@
SalesQuotationDto afterSalesService = new SalesQuotationDto();
IPage<SalesQuotationDto> listPage = salesQuotationService.listPage(page, afterSalesService);
ExcelUtil<SalesQuotationDto> util = new ExcelUtil<SalesQuotationDto>(SalesQuotationDto.class);
- util.exportExcel(response, listPage.getRecords() , "鍙嶉鐧昏");
+ util.exportExcel(response, listPage.getRecords() , "閿�鍞姤浠�");
}
@PostMapping("/add")
- public AjaxResult add(@RequestBody SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.add(salesQuotationDto));
+ public R<?> add(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.add(salesQuotationDto));
}
@PostMapping("/update")
- public AjaxResult update(@RequestBody SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.edit(salesQuotationDto));
+ public R<?> update(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.edit(salesQuotationDto));
}
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody Long id) {
- return AjaxResult.success(salesQuotationService.delete(id));
+ public R<?> delete(@RequestBody Long id) {
+ return R.ok(salesQuotationService.delete(id));
}
}
--
Gitblit v1.9.3