From 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 19:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 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..f9251f8 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -1,33 +1,25 @@
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.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")
+@AllArgsConstructor
public class SalesQuotationController {
- @Autowired
- private SalesQuotationService salesQuotationService;
+ private final SalesQuotationService salesQuotationService;
@GetMapping("/list")
public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
}
+
@PostMapping("/export")
public void export(HttpServletResponse response) {
@@ -35,7 +27,7 @@
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() , "閿�鍞姤浠�");
}
--
Gitblit v1.9.3