feat: 优化业务导入及工艺流程管理

云

9 天以前 bf5f52656e128f578ed42c7979c31cf4b476ce46

 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;
@@ -67,8 +72,28 @@
    @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.write(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')")
@@ -86,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或多个ids
        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) {
@@ -108,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));
@@ -116,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));
@@ -124,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));
@@ -157,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());
@@ -167,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. 填充客户名称
@@ -176,6 +221,13 @@
            CrmCustomerDO customer = customerService.getCustomer(saleQuotation.getCustomerId());
            if (customer != null) {
                respVO.setCustomerName(customer.getName());
            }
        }
        // 2.1 填充商机名称
        if (saleQuotation.getBusinessId() != null) {
            CrmBusinessDO business = businessService.getBusiness(saleQuotation.getBusinessId());
            if (business != null) {
                respVO.setBusinessName(business.getName());
            }
        }
        // 3. 填充关联信息
@@ -195,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));
@@ -204,15 +265,29 @@
        // 1.5 部门信息
        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
                convertSet(pageResult.getList(), CrmSaleQuotationDO::getOwnerUserId));
        // 1.6 商机信息（过滤 null，businessId 为可选字段）
        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()));
        });
    }

@@ -243,4 +318,4 @@
        }
    }

}
}