fix(erp): 采购申请单条详情补全申请人/部门/供应商名称

gaoluyang

7 天以前 053b6d369333b85d7ca8cc278830a3909dd8023e

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java

@@ -8,6 +8,7 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestDeptStatisticsRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
@@ -34,13 +35,17 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;

@@ -99,7 +104,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得采购申请")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
    public CommonResult<ErpPurchaseRequestRespVO> getPurchaseRequest(@RequestParam("id") Long id) {
        ErpPurchaseRequestDO purchaseRequest = purchaseRequestService.getPurchaseRequest(id);
        if (purchaseRequest == null) {
@@ -110,18 +114,29 @@
                convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
        Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
                convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductUnitId));
        return success(BeanUtils.toBean(purchaseRequest, ErpPurchaseRequestRespVO.class, purchaseRequestVO ->
                purchaseRequestVO.setItems(BeanUtils.toBean(purchaseRequestItemList, ErpPurchaseRequestRespVO.Item.class, item -> {
                    MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
                            .setProductBarCode(mdmItem.getBarCode()));
                    MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
                            item.setProductUnitName(unit.getName()));
                })).setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id))));
        // 供应商 / 申请人 / 申请部门名称（单条详情与分页保持一致，审批详情页依赖这些名称）
        Map<Long, SrmSupplierRespDTO> supplierMap = getSupplierMap(
                convertSet(Collections.singletonList(purchaseRequest), ErpPurchaseRequestDO::getSupplierId));
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                convertSet(Collections.singletonList(purchaseRequest), ErpPurchaseRequestDO::getRequestUserId));
        Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
                convertSet(Collections.singletonList(purchaseRequest), ErpPurchaseRequestDO::getRequestDeptId));
        return success(BeanUtils.toBean(purchaseRequest, ErpPurchaseRequestRespVO.class, purchaseRequestVO -> {
            purchaseRequestVO.setItems(BeanUtils.toBean(purchaseRequestItemList, ErpPurchaseRequestRespVO.Item.class, item -> {
                MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
                        .setProductBarCode(mdmItem.getBarCode()));
                MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
                        item.setProductUnitName(unit.getName()));
            }));
            MapUtils.findAndThen(supplierMap, purchaseRequestVO.getSupplierId(), supplier -> purchaseRequestVO.setSupplierName(supplier.getName()));
            MapUtils.findAndThen(userMap, purchaseRequestVO.getRequestUserId(), user -> purchaseRequestVO.setRequestUserName(user.getNickname()));
            MapUtils.findAndThen(deptMap, purchaseRequestVO.getRequestDeptId(), dept -> purchaseRequestVO.setRequestDeptName(dept.getName()));
            purchaseRequestVO.setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id));
        }));
    }

    @GetMapping("/page")
    @Operation(summary = "获得采购申请分页")
    @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
    public CommonResult<PageResult<ErpPurchaseRequestRespVO>> getPurchaseRequestPage(@Valid ErpPurchaseRequestPageReqVO pageReqVO) {
        PageResult<ErpPurchaseRequestDO> pageResult = purchaseRequestService.getPurchaseRequestPage(pageReqVO);
        return success(buildPurchaseRequestVOPageResult(pageResult));
@@ -183,9 +198,21 @@

    @GetMapping("/approve-process-list")
    @Operation(summary = "获取采购申请审批流程列表")
    @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
    public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
        return success(purchaseRequestService.getPurchaseRequestApproveProcessDefinitionList());
    }

    @GetMapping("/statistics/dept")
    @Operation(summary = "获得采购申请部门统计")
    @PreAuthorize("@ss.hasPermission('erp:purchase-request:statistics')")
    public CommonResult<List<ErpPurchaseRequestDeptStatisticsRespVO>> getDeptStatistics(
            @Parameter(name = "beginTime", description = "申请时间开始", example = "2026-01-01 00:00:00")
            @RequestParam(value = "beginTime", required = false)
            @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
            @Parameter(name = "endTime", description = "申请时间结束", example = "2026-12-31 23:59:59")
            @RequestParam(value = "endTime", required = false)
            @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
        return success(purchaseRequestService.getDeptStatistics(beginTime, endTime));
    }

    @PostMapping("/generate-order")
@@ -208,9 +235,8 @@
        Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
                convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
        // 1.3 供应商信息
        Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
                convertSet(pageResult.getList(), ErpPurchaseRequestDO::getSupplierId)).getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
        Map<Long, SrmSupplierRespDTO> supplierMap = getSupplierMap(
                convertSet(pageResult.getList(), ErpPurchaseRequestDO::getSupplierId));
        // 1.4 用户信息
        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
                convertSet(pageResult.getList(), ErpPurchaseRequestDO::getRequestUserId));
@@ -229,4 +255,9 @@
        });
    }

}
    private Map<Long, SrmSupplierRespDTO> getSupplierMap(Collection<Long> supplierIds) {
        return srmSupplierApi.getSupplierList(supplierIds).getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
    }

}