From 03965438c47dc6620bf5bf9ebb7ae97e805b4aae Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 15 十月 2026 15:44:44 +0800
Subject: [PATCH] fix(crm,mes): 客户转化统计漏行、归档台账分页与排序
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/archive/MesPdArchiveServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/archive/MesPdArchiveServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/archive/MesPdArchiveServiceImpl.java
index 934449a..4478e0e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/archive/MesPdArchiveServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pd/archive/MesPdArchiveServiceImpl.java
@@ -13,6 +13,7 @@
import cn.iocoder.yudao.module.mes.dal.mysql.pd.archive.MesPdArchiveMapper;
import cn.iocoder.yudao.module.mes.service.pd.document.MesPdDocumentService;
import cn.iocoder.yudao.module.mes.service.pd.project.MesPdProjectService;
+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 com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,6 +53,10 @@
@Resource
@Lazy
private AdminUserApi adminUserApi;
+
+ @Resource
+ @Lazy
+ private StorageAttachmentApi storageAttachmentApi;
@Override
public Long createArchive(MesPdArchiveSaveReqVO createReqVO) {
@@ -146,8 +151,12 @@
Map<Long, AdminUserRespDTO> uploadUserMap = adminUserApi.getUserMap(
cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet(documents, MesPdDocumentDO::getUploadUserId));
List<MesPdArchiveDetailRespVO.DocumentInfo> documentInfos = BeanUtils.toBean(documents, MesPdArchiveDetailRespVO.DocumentInfo.class,
- info -> MapUtils.findAndThen(uploadUserMap, info.getUploadUserId(),
- user -> info.setUploadUserNickname(user.getNickname())));
+ info -> {
+ MapUtils.findAndThen(uploadUserMap, info.getUploadUserId(),
+ user -> info.setUploadUserNickname(user.getNickname()));
+ // 璧勬枡鏂囦欢璧� system 妯″潡鐨勯檮浠朵腑闂磋〃锛屼笟鍔¤〃涓嶅瓨鏂囦欢鍦板潃锛岃繖閲屽洖濉墠绠楄兘棰勮/涓嬭浇
+ info.setAttachmentList(storageAttachmentApi.listAttachments("mes_pd_document", info.getId()));
+ });
respVO.setDocuments(documentInfos);
}
mesPdArchiveDetailRespVOS.add(respVO);
--
Gitblit v1.9.3