|
@@ -213,12 +213,28 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
|
|
|
IPage<KlConceptStaticDTO> page = super.getPage(klConceptStaticPageVO);
|
|
|
List<KlConceptStaticDTO> records = page.getRecords();
|
|
|
- if (ListUtil.isNotEmpty(records)) {
|
|
|
+ List<Long> conceptIds = page.getRecords()
|
|
|
+ .stream()
|
|
|
+ .map(KlConceptStaticDTO::getId)
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ if (ListUtil.isNotEmpty(conceptIds)) {
|
|
|
+ QueryWrapper<KlConceptDetail> qw = new QueryWrapper<>();
|
|
|
+ qw.in("concept_id", conceptIds)
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .orderByAsc("concept_id")
|
|
|
+ .orderByAsc("order_no");
|
|
|
+ Map<Long, List<KlConceptDetail>> detailMap = klConceptDetailFacade.list(qw)
|
|
|
+ .stream().collect(Collectors.groupingBy(KlConceptDetail::getConceptId));
|
|
|
+
|
|
|
records.forEach(record -> {
|
|
|
String typeName = LexiconEnum.getName(record.getType());
|
|
|
record.setTypeName(dicTypeNameMap.get(typeName));
|
|
|
Integer retType = convertType(record.getType(), 2);
|
|
|
record.setType(retType);
|
|
|
+ record.setTitle(detailMap.get(record.getId())
|
|
|
+ .stream()
|
|
|
+ .map(KlConceptDetail::getTitle)
|
|
|
+ .collect(Collectors.joining("、")));
|
|
|
});
|
|
|
}
|
|
|
page.setRecords(records);
|