From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
index fda9a92..00cfc2f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/CrmSaleQuotationController.java
@@ -9,6 +9,9 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationPageReqVO;
+import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationImportExcelVO;
+import cn.iocoder.yudao.module.crm.service.quotation.CrmSaleQuotationImportService;
+import org.springframework.web.multipart.MultipartFile;
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.quotation.vo.CrmSaleQuotationSaveReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationDO;
@@ -73,6 +76,24 @@
@Resource
private StorageAttachmentApi storageAttachmentApi;
+ @Resource
+ private CrmSaleQuotationImportService quotationImportService;
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "涓嬭浇閿�鍞姤浠峰鍏ユā鏉�")
+ @PreAuthorize("@ss.hasPermission('crm:sale-quotation:create')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ ExcelUtils.writeTemplate(response, "閿�鍞姤浠峰鍏ユā鏉�.xls", "鎶ヤ环鏄庣粏", CrmSaleQuotationImportExcelVO.class, java.util.Collections.emptyList());
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閿�鍞姤浠凤紙浠呮柊澧烇級")
+ @PreAuthorize("@ss.hasPermission('crm:sale-quotation:create')")
+ public CommonResult<Map<String, Object>> importQuotation(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", defaultValue = "false") boolean updateSupport) throws Exception {
+ if (updateSupport) throw new IllegalArgumentException("鎶ヤ环瀵煎叆浠呮敮鎸佹柊澧烇紝璇峰叧闂鐩栭�夐」");
+ return success(quotationImportService.importRows(ExcelUtils.read(file, CrmSaleQuotationImportExcelVO.class), getLoginUserId()));
+ }
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞姤浠峰崟")
@PreAuthorize("@ss.hasPermission('crm:sale-quotation:create')")
@@ -90,17 +111,30 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎閿�鍞姤浠峰崟")
- @Parameter(name = "ids", description = "缂栧彿鏁扮粍", required = true)
+ @Parameter(name = "id", description = "鍗曚釜缂栧彿", required = false)
+ @Parameter(name = "ids", description = "缂栧彿鏁扮粍", required = false)
@PreAuthorize("@ss.hasPermission('crm:sale-quotation:delete')")
- public CommonResult<Boolean> deleteSaleQuotation(@RequestParam("ids") List<Long> ids) {
- saleQuotationService.deleteSaleQuotation(ids);
+ public CommonResult<Boolean> deleteSaleQuotation(
+ @RequestParam(value = "id", required = false) Long id,
+ @RequestParam(value = "ids", required = false) List<Long> ids) {
+ // 鏀寔鍗曚釜id鎴栧涓猧ds
+ List<Long> deleteIds = new java.util.ArrayList<>();
+ if (id != null) {
+ deleteIds.add(id);
+ }
+ if (ids != null && !ids.isEmpty()) {
+ deleteIds.addAll(ids);
+ }
+ if (deleteIds.isEmpty()) {
+ throw new IllegalArgumentException("璇锋眰鍙傛暟缂哄け:id 鎴� ids");
+ }
+ saleQuotationService.deleteSaleQuotation(deleteIds);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "鑾峰緱閿�鍞姤浠峰崟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('crm:sale-quotation:query')")
public CommonResult<CrmSaleQuotationRespVO> getSaleQuotation(@RequestParam("id") Long id) {
CrmSaleQuotationDO saleQuotation = saleQuotationService.getSaleQuotation(id);
if (saleQuotation == null) {
@@ -112,7 +146,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閿�鍞姤浠峰崟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('crm:sale-quotation:query')")
public CommonResult<PageResult<CrmSaleQuotationRespVO>> getSaleQuotationPage(@Valid CrmSaleQuotationPageReqVO pageReqVO) {
PageResult<CrmSaleQuotationDO> pageResult = saleQuotationService.getSaleQuotationPage(pageReqVO, getLoginUserId());
return success(buildSaleQuotationRespVOPageResult(pageResult));
@@ -120,7 +153,6 @@
@GetMapping("/page-by-customer")
@Operation(summary = "鑾峰緱閿�鍞姤浠峰崟鍒嗛〉锛堝熀浜庡鎴凤級")
- @PreAuthorize("@ss.hasPermission('crm:sale-quotation:query')")
public CommonResult<PageResult<CrmSaleQuotationRespVO>> getSaleQuotationPageByCustomerId(@Valid CrmSaleQuotationPageReqVO pageReqVO) {
PageResult<CrmSaleQuotationDO> pageResult = saleQuotationService.getSaleQuotationPageByCustomerId(pageReqVO);
return success(buildSaleQuotationRespVOPageResult(pageResult));
@@ -128,7 +160,6 @@
@GetMapping("/page-by-business")
@Operation(summary = "鑾峰緱閿�鍞姤浠峰崟鍒嗛〉锛堝熀浜庡晢鏈猴級")
- @PreAuthorize("@ss.hasPermission('crm:sale-quotation:query')")
public CommonResult<PageResult<CrmSaleQuotationRespVO>> getSaleQuotationPageByBusinessId(@Valid CrmSaleQuotationPageReqVO pageReqVO) {
PageResult<CrmSaleQuotationDO> pageResult = saleQuotationService.getSaleQuotationPageByBusinessId(pageReqVO);
return success(buildSaleQuotationRespVOPageResult(pageResult));
--
Gitblit v1.9.3