From 667d59e59a94fdbcb168904fbf40a011e15acc98 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期二, 24 六月 2025 17:33:05 +0800 Subject: [PATCH] 2025-06-23 付款方式字段添加, 附件上传接口对接完成 --- src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java index 02fa3e0..a8b594d 100644 --- a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java +++ b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java @@ -4,12 +4,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.enums.FileNameType; import com.ruoyi.purchase.dto.ProductRecordDto; import com.ruoyi.purchase.dto.TicketRegistrationDto; import com.ruoyi.purchase.mapper.ProductRecordMapper; import com.ruoyi.purchase.pojo.ProductRecord; import com.ruoyi.purchase.service.IProductRecordService; +import com.ruoyi.sales.mapper.CommonFileMapper; +import com.ruoyi.sales.pojo.CommonFile; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -24,7 +29,13 @@ @AllArgsConstructor public class ProductRecordServiceImpl extends ServiceImpl<ProductRecordMapper, ProductRecord> implements IProductRecordService { + @Autowired private ProductRecordMapper productRecordMapper; + + @Autowired + private CommonFileMapper commonFileMapper; + + /** @@ -41,8 +52,11 @@ @Override public IPage<ProductRecordDto> productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) { - - return productRecordMapper.productRecordPage(page, ticketRegistrationDto); + IPage<ProductRecordDto> productRecordDtoIPage = productRecordMapper.productRecordPage(page, ticketRegistrationDto); + productRecordDtoIPage.getRecords().forEach(productRecordDto -> { + productRecordDto.setCommonFiles(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, productRecordDto.getTicketRegistrationId()) + .eq(CommonFile::getType, FileNameType.PURCHASELEDGER.getValue()))); + }); + return productRecordDtoIPage; } - } -- Gitblit v1.9.3