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 @@ -88,14 +89,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; src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerServiceImpl.java
@@ -75,14 +75,15 @@ LambdaQueryWrapper<MeasuringInstrumentLedgerRecord> measuringInstrumentLedgerRecordLambdaQueryWrapper = new LambdaQueryWrapper<>(); measuringInstrumentLedgerRecordLambdaQueryWrapper.eq(MeasuringInstrumentLedgerRecord::getMeasuringInstrumentLedgerId, item.getId()); List<MeasuringInstrumentLedgerRecord> measuringInstrumentLedgerRecords = measuringInstrumentLedgerRecordMapper.selectList(measuringInstrumentLedgerRecordLambdaQueryWrapper); List<Long> collect = new ArrayList<>(); if(!CollectionUtils.isEmpty(measuringInstrumentLedgerRecords)){ List<Long> collect = measuringInstrumentLedgerRecords.stream().map(MeasuringInstrumentLedgerRecord::getId).collect(Collectors.toList()); collect.add(item.getId()); LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>(); salesLedgerFileWrapper.in(CommonFile::getCommonId, collect); List<CommonFile> commonFiles = commonFileMapper.selectList(salesLedgerFileWrapper); item.setCommonFiles(commonFiles); collect = measuringInstrumentLedgerRecords.stream().map(MeasuringInstrumentLedgerRecord::getId).collect(Collectors.toList()); } collect.add(item.getId()); LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>(); salesLedgerFileWrapper.in(CommonFile::getCommonId, collect); List<CommonFile> commonFiles = commonFileMapper.selectList(salesLedgerFileWrapper); item.setCommonFiles(commonFiles); }); return measuringInstrumentLedgerIPage;
