From 2d244c0bf9f39ea87724f8066a9287b35c51c3b6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 08 八月 2025 17:06:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java
index 0dbdc71..e9b191c 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java
@@ -35,6 +35,7 @@
import java.util.Date;
import java.util.List;
import java.util.UUID;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -64,7 +65,8 @@
IPage<MeasuringInstrumentLedgerRecord> measuringInstrumentLedgerRecordIPage = measuringInstrumentLedgerRecordMapper.listPage(page, measuringInstrumentLedgerRecord);
measuringInstrumentLedgerRecordIPage.getRecords().forEach(item -> {
LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
- salesLedgerFileWrapper.eq(CommonFile::getCommonId, item.getId());
+ salesLedgerFileWrapper.eq(CommonFile::getCommonId, item.getId())
+ .eq(CommonFile::getType, FileNameType.MEASURINGRecord.getValue());
List<CommonFile> commonFiles = commonFileMapper.selectList(salesLedgerFileWrapper);
item.setCommonFiles(commonFiles);
});
@@ -88,14 +90,12 @@
if(!measuringInstrumentLedgerRecord1.getValid().equals(measuringInstrumentLedgerRecord.getValid())){
MeasuringInstrumentLedger measuringInstrumentLedger = measuringInstrumentLedgerMapper.selectById(measuringInstrumentLedgerRecord1.getMeasuringInstrumentLedgerId());
if(measuringInstrumentLedger != null){
+ measuringInstrumentLedger.setValid(measuringInstrumentLedgerRecord.getValid());
measuringInstrumentLedger.setNextDate(new Date(measuringInstrumentLedger.getMostDate().getTime() + measuringInstrumentLedgerRecord.getValid() * 24 * 60 * 60 * 1000L));
}
measuringInstrumentLedgerMapper.updateById(measuringInstrumentLedger);
}
- // 鍒犻櫎闄勪欢
- LambdaQueryWrapper<CommonFile> delWrapper = new LambdaQueryWrapper<>();
- delWrapper.eq(CommonFile::getCommonId, measuringInstrumentLedgerRecord.getId());
- commonFileMapper.delete(delWrapper);
+ measuringInstrumentLedgerRecordMapper.updateById(measuringInstrumentLedgerRecord);
// 璁板綍闄勪欢缁戝畾
migrateTempFilesToFormal(measuringInstrumentLedgerRecord.getId(), measuringInstrumentLedgerRecord.getTempFileIds(), FileNameType.MEASURINGRecord.getValue());
return true;
--
Gitblit v1.9.3