From 6bd1dc0b355e279b709bc49dda5207121e9b41a9 Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期四, 15 五月 2025 15:41:26 +0800 Subject: [PATCH] 1.来票台账优化 2.上传优化 --- src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java index f49faf8..35ea9f5 100644 --- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java +++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java @@ -14,11 +14,11 @@ import com.ruoyi.purchase.mapper.PurchaseLedgerMapper; import com.ruoyi.purchase.pojo.PurchaseLedger; import com.ruoyi.purchase.service.IPurchaseLedgerService; -import com.ruoyi.sales.mapper.SalesLedgerFileMapper; +import com.ruoyi.sales.mapper.CommonFileMapper; import com.ruoyi.sales.mapper.SalesLedgerMapper; import com.ruoyi.sales.mapper.SalesLedgerProductMapper; +import com.ruoyi.sales.pojo.CommonFile; import com.ruoyi.sales.pojo.SalesLedger; -import com.ruoyi.sales.pojo.SalesLedgerFile; import com.ruoyi.sales.pojo.SalesLedgerProduct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -59,7 +59,7 @@ private final TempFileMapper tempFileMapper; - private final SalesLedgerFileMapper salesLedgerFileMapper; + private final CommonFileMapper commonFileMapper; @Value("${file.upload-dir}") private String uploadDir; @@ -207,12 +207,13 @@ log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath); // 鏇存柊鏂囦欢璁板綍锛堝叧鑱斿埌涓氬姟ID锛� - SalesLedgerFile fileRecord = new SalesLedgerFile(); - fileRecord.setLedgerId(businessId); + CommonFile fileRecord = new CommonFile(); + fileRecord.setCommonId(businessId); fileRecord.setName(originalFilename); fileRecord.setUrl(formalFilePath.toString()); fileRecord.setCreateTime(LocalDateTime.now()); - salesLedgerFileMapper.insert(fileRecord); + fileRecord.setType("2"); + commonFileMapper.insert(fileRecord); // 鍒犻櫎涓存椂鏂囦欢璁板綍 tempFileMapper.deleteById(tempFile); @@ -246,9 +247,9 @@ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper); // 3.鏌ヨ涓婁紶鏂囦欢 - LambdaQueryWrapper<SalesLedgerFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>(); - salesLedgerFileWrapper.eq(SalesLedgerFile::getLedgerId, purchaseLedger.getId()); - List<SalesLedgerFile> salesLedgerFiles = salesLedgerFileMapper.selectList(salesLedgerFileWrapper); + LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>(); + salesLedgerFileWrapper.eq(CommonFile::getCommonId, purchaseLedger.getId()); + List<CommonFile> salesLedgerFiles = commonFileMapper.selectList(salesLedgerFileWrapper); // 4. 杞崲 DTO PurchaseLedgerDto resultDto = new PurchaseLedgerDto(); -- Gitblit v1.9.3