fix(crm,mes): 客户转化统计漏行、归档台账分页与排序

gaoluyang

11 小时以前 03965438c47dc6620bf5bf9ebb7ae97e805b4aae

 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;
@@ -32,7 +33,7 @@
/**
 * MES 归档台账 Service 实现类
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Service
@Validated
@@ -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);