|
|
@ -98,7 +98,7 @@ public class TicketMatterGroupServiceImpl extends BaseServiceImpl<TicketMatterGr |
|
|
|
Map<String, List<TwoTicketMatterLibraryEntity>> libraryMap = libraryEntityList.stream() |
|
|
|
Map<String, List<TwoTicketMatterLibraryEntity>> libraryMap = libraryEntityList.stream() |
|
|
|
.sorted(Comparator.comparing(TwoTicketMatterLibraryEntity::getType).thenComparing(TwoTicketMatterLibraryEntity::getSort)).collect(Collectors.groupingBy(TwoTicketMatterLibraryEntity::getType)); |
|
|
|
.sorted(Comparator.comparing(TwoTicketMatterLibraryEntity::getType).thenComparing(TwoTicketMatterLibraryEntity::getSort)).collect(Collectors.groupingBy(TwoTicketMatterLibraryEntity::getType)); |
|
|
|
libraryMap.forEach((type, list) -> { |
|
|
|
libraryMap.forEach((type, list) -> { |
|
|
|
if (ONE_TYPE.equals(type)) { |
|
|
|
if (ONE_TYPE.equals(type) || FOUR_TYPE.equals(type)) { |
|
|
|
groupVO.setMatterLibraryListOne(TwoTicketMatterLibraryWrapper.build().listVO(list)); |
|
|
|
groupVO.setMatterLibraryListOne(TwoTicketMatterLibraryWrapper.build().listVO(list)); |
|
|
|
} else if (TWO_TYPE.equals(type)) { |
|
|
|
} else if (TWO_TYPE.equals(type)) { |
|
|
|
groupVO.setMatterLibraryListTwo(TwoTicketMatterLibraryWrapper.build().listVO(list)); |
|
|
|
groupVO.setMatterLibraryListTwo(TwoTicketMatterLibraryWrapper.build().listVO(list)); |
|
|
|