bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报废修复

This commit is contained in:
sxu 2024-12-17 16:10:11 +08:00
parent fd395e88ca
commit 4872c72fb7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java
View File

@ -125,6 +125,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
// 根据订单id查询订单详情 // 根据订单id查询订单详情
List<LeaseRepairRecord> list = mapper.getLeaseRepairRecordList(dto); List<LeaseRepairRecord> list = mapper.getLeaseRepairRecordList(dto);
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
List<BmFileInfo> fileList = new ArrayList<>();
for (LeaseRepairRecord leaseRepairRecord : list) { for (LeaseRepairRecord leaseRepairRecord : list) {
if (leaseRepairRecord.getRepairChangePrice() != null || leaseRepairRecord.getScrapChangePrice() != null if (leaseRepairRecord.getRepairChangePrice() != null || leaseRepairRecord.getScrapChangePrice() != null
|| leaseRepairRecord.getLossChangePrice() != null) { || leaseRepairRecord.getLossChangePrice() != null) {
@ -148,10 +149,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
BmFileInfo bmFileInfo = new BmFileInfo(); BmFileInfo bmFileInfo = new BmFileInfo();
bmFileInfo.setModelId(Long.valueOf(leaseRepairRecord.getMaId())); bmFileInfo.setModelId(Long.valueOf(leaseRepairRecord.getMaId()));
bmFileInfo.setTaskType(MaterialConstants.LEASE_REPAIR_RECORD_TABLE_NAME); bmFileInfo.setTaskType(MaterialConstants.LEASE_REPAIR_RECORD_TABLE_NAME);
List<BmFileInfo> fileList = bmFileInfoMapper.selectBmFileInfoList(bmFileInfo); fileList.addAll(bmFileInfoMapper.selectBmFileInfoList(bmFileInfo));
if (CollectionUtils.isNotEmpty(fileList)) {
leaseRecordDto.setFileInfoList(fileList);
}
if (leaseRecordDto.getRepairRecordList() == null) { if (leaseRecordDto.getRepairRecordList() == null) {
leaseRecordDto.setRepairRecordList(new ArrayList<>()); leaseRecordDto.setRepairRecordList(new ArrayList<>());
} }
@ -171,6 +169,9 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService {
leaseRecordDto.getLossRecordList().add(leaseRepairRecord); leaseRecordDto.getLossRecordList().add(leaseRepairRecord);
} }
} }
if (CollectionUtils.isNotEmpty(fileList)) {
leaseRecordDto.setFileInfoList(fileList);
}
} }
leaseRecordDto.setTotalCost(totalCost); leaseRecordDto.setTotalCost(totalCost);
return leaseRecordDto; return leaseRecordDto;