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 | 104 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 92 insertions(+), 12 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 2bad9a7..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,11 +9,16 @@
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;
import cn.iocoder.yudao.module.crm.dal.dataobject.quotation.CrmSaleQuotationProductDO;
+import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
+import cn.iocoder.yudao.module.crm.service.business.CrmBusinessService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
import cn.iocoder.yudao.module.crm.service.quotation.CrmSaleQuotationService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
@@ -22,6 +27,7 @@
import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -65,7 +71,29 @@
private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private CrmCustomerService customerService;
+ @Resource
+ private CrmBusinessService businessService;
+ @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')")
@@ -83,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) {
@@ -105,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));
@@ -113,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));
@@ -121,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));
@@ -154,9 +192,14 @@
// 1. 鏋勫缓鐗╂枡鏄庣粏
if (CollUtil.isNotEmpty(productList)) {
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(convertSet(productList, CrmSaleQuotationProductDO::getItemId));
+ java.util.Set<Long> unitIds = new java.util.HashSet<>(convertSet(productList, CrmSaleQuotationProductDO::getItemUnitId));
+ itemMap.values().forEach(item -> {
+ if (item.getUnitMeasureId2() != null) {
+ unitIds.add(item.getUnitMeasureId2());
+ }
+ });
Map<Long, MdmUnitMeasureRespDTO> unitMap = convertMap(
- mdmUnitMeasureApi.getUnitMeasureList(
- convertSet(productList, CrmSaleQuotationProductDO::getItemUnitId)).getCheckedData(),
+ mdmUnitMeasureApi.getUnitMeasureList(unitIds).getCheckedData(),
MdmUnitMeasureRespDTO::getId);
respVO.setItems(BeanUtils.toBean(productList, CrmSaleQuotationRespVO.Item.class, item -> {
MdmItemRespDTO mdmItem = itemMap.get(item.getItemId());
@@ -164,8 +207,13 @@
item.setItemCode(mdmItem.getCode());
item.setItemName(mdmItem.getName());
item.setItemBarCode(mdmItem.getBarCode());
+ item.setItemSpecification(mdmItem.getSpecification());
+ item.setItemUnitId2(mdmItem.getUnitMeasureId2());
+ item.setItemUnitId3(mdmItem.getUnitMeasureId3());
}
MapUtils.findAndThen(unitMap, item.getItemUnitId(), unit -> item.setItemUnitName(unit.getName()));
+ MapUtils.findAndThen(unitMap, item.getItemUnitId2(), unit -> item.setItemUnitName2(unit.getName()));
+ MapUtils.findAndThen(unitMap, item.getItemUnitId3(), unit -> item.setItemUnitName3(unit.getName()));
}));
}
// 2. 濉厖瀹㈡埛鍚嶇О
@@ -175,8 +223,17 @@
respVO.setCustomerName(customer.getName());
}
}
+ // 2.1 濉厖鍟嗘満鍚嶇О
+ if (saleQuotation.getBusinessId() != null) {
+ CrmBusinessDO business = businessService.getBusiness(saleQuotation.getBusinessId());
+ if (business != null) {
+ respVO.setBusinessName(business.getName());
+ }
+ }
// 3. 濉厖鍏宠仈淇℃伅
fillSaleQuotationRelatedFields(respVO);
+ // 4. 濉厖闄勪欢鍒楄〃
+ respVO.setAttachmentList(storageAttachmentApi.listAttachments("crm_sale_quotation", saleQuotation.getId()));
return respVO;
}
@@ -190,6 +247,15 @@
Map<Long, List<CrmSaleQuotationProductDO>> productMap = convertMultiMap(productList, CrmSaleQuotationProductDO::getQuotationId);
// 1.2 鐗╂枡淇℃伅
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(convertSet(productList, CrmSaleQuotationProductDO::getItemId));
+ java.util.Set<Long> unitIds = new java.util.HashSet<>(convertSet(productList, CrmSaleQuotationProductDO::getItemUnitId));
+ itemMap.values().forEach(item -> {
+ if (item.getUnitMeasureId2() != null) {
+ unitIds.add(item.getUnitMeasureId2());
+ }
+ });
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = convertMap(
+ mdmUnitMeasureApi.getUnitMeasureList(unitIds).getCheckedData(),
+ MdmUnitMeasureRespDTO::getId);
// 1.3 瀹㈡埛淇℃伅
Map<Long, CrmCustomerDO> customerMap = customerService.getCustomerMap(
convertSet(pageResult.getList(), CrmSaleQuotationDO::getCustomerId));
@@ -199,15 +265,29 @@
// 1.5 閮ㄩ棬淇℃伅
Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
convertSet(pageResult.getList(), CrmSaleQuotationDO::getOwnerUserId));
+ // 1.6 鍟嗘満淇℃伅锛堣繃婊� null锛宐usinessId 涓哄彲閫夊瓧娈碉級
+ Map<Long, CrmBusinessDO> businessMap = businessService.getBusinessMap(
+ convertSet(pageResult.getList(), CrmSaleQuotationDO::getBusinessId, vo -> vo.getBusinessId() != null));
// 2. 寮�濮嬫嫾鎺�
return BeanUtils.toBean(pageResult, CrmSaleQuotationRespVO.class, vo -> {
vo.setItems(BeanUtils.toBean(productMap.get(vo.getId()), CrmSaleQuotationRespVO.Item.class,
- item -> MapUtils.findAndThen(itemMap, item.getItemId(), mdmItem -> item.setItemCode(mdmItem.getCode())
- .setItemName(mdmItem.getName()).setItemBarCode(mdmItem.getBarCode()))));
+ item -> {
+ MapUtils.findAndThen(itemMap, item.getItemId(), mdmItem -> item
+ .setItemCode(mdmItem.getCode())
+ .setItemName(mdmItem.getName())
+ .setItemBarCode(mdmItem.getBarCode())
+ .setItemSpecification(mdmItem.getSpecification())
+ .setItemUnitId2(mdmItem.getUnitMeasureId2())
+ .setItemUnitId3(mdmItem.getUnitMeasureId3()));
+ MapUtils.findAndThen(unitMap, item.getItemUnitId(), unit -> item.setItemUnitName(unit.getName()));
+ MapUtils.findAndThen(unitMap, item.getItemUnitId2(), unit -> item.setItemUnitName2(unit.getName()));
+ MapUtils.findAndThen(unitMap, item.getItemUnitId3(), unit -> item.setItemUnitName3(unit.getName()));
+ }));
MapUtils.findAndThen(customerMap, vo.getCustomerId(), customer -> vo.setCustomerName(customer.getName()));
MapUtils.findAndThen(userMap, vo.getOwnerUserId(), user -> vo.setOwnerUserName(user.getNickname()));
MapUtils.findAndThen(deptMap, vo.getOwnerUserId(), dept -> vo.setOwnerUserDeptName(dept.getName()));
+ MapUtils.findAndThen(businessMap, vo.getBusinessId(), business -> vo.setBusinessName(business.getName()));
});
}
@@ -238,4 +318,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3