|
@@ -1817,12 +1817,14 @@ public class ApiController {
|
|
Set<String> scorePackageIds = scorePackageList.stream()
|
|
Set<String> scorePackageIds = scorePackageList.stream()
|
|
.filter(output -> PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(output.getPackageType1()))
|
|
.filter(output -> PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val().equals(output.getPackageType1()))
|
|
.map(WmScorePackageApiOutput::getId).collect(Collectors.toSet());
|
|
.map(WmScorePackageApiOutput::getId).collect(Collectors.toSet());
|
|
- List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
|
|
|
|
- .in(WmScorePackageSettleNote::getPackageId, scorePackageIds));
|
|
|
|
Map<String, List<WmScorePackageSettleNote>> settelMap = new HashMap<>();
|
|
Map<String, List<WmScorePackageSettleNote>> settelMap = new HashMap<>();
|
|
- if (CollUtil.isNotEmpty(settleNotes)) {
|
|
|
|
- settelMap = settleNotes.stream()
|
|
|
|
- .collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
|
|
|
|
|
|
+ if (CollUtil.isNotEmpty(scorePackageIds)) {
|
|
|
|
+ List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
|
|
|
|
+ .in(WmScorePackageSettleNote::getPackageId, scorePackageIds));
|
|
|
|
+ if (CollUtil.isNotEmpty(settleNotes)) {
|
|
|
|
+ settelMap = settleNotes.stream()
|
|
|
|
+ .collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
// Map<String, Object> map = new HashMap<>();
|
|
// Map<String, Object> map = new HashMap<>();
|
|
for (WmScorePackageApiOutput item : scorePackageList) {
|
|
for (WmScorePackageApiOutput item : scorePackageList) {
|