【优化】添加多语言支持
This commit is contained in:
parent
e35a9051d2
commit
fde5a14982
|
|
@ -24,6 +24,11 @@ public class SolutionMeasuresItemVO {
|
||||||
@NotBlank
|
@NotBlank
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 措施分类类型
|
||||||
|
*/
|
||||||
|
private String type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 具体的措施
|
* 具体的措施
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -93,11 +93,13 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
|
||||||
items = initial.stream().map(it -> new SolutionMeasuresItemVO()
|
items = initial.stream().map(it -> new SolutionMeasuresItemVO()
|
||||||
.setId(it.getId())
|
.setId(it.getId())
|
||||||
.setName(it.getName())
|
.setName(it.getName())
|
||||||
|
.setType(it.getValue())
|
||||||
.setItems(Collections.emptyList()))
|
.setItems(Collections.emptyList()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
} else if (CollectionUtil.isEmpty(initial)) {
|
} else if (CollectionUtil.isEmpty(initial)) {
|
||||||
items = groupedSolutions.entrySet().stream().map(ks -> new SolutionMeasuresItemVO()
|
items = groupedSolutions.entrySet().stream().map(ks -> new SolutionMeasuresItemVO()
|
||||||
.setName(ks.getValue().get(0).getDictionaryItemName())
|
.setName(ks.getValue().get(0).getDictionaryItemName())
|
||||||
|
.setType(ks.getValue().get(0).getDictionaryItemName())
|
||||||
.setItems(ks.getValue()
|
.setItems(ks.getValue()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(v -> StrUtil.isNotBlank(v.getDescription()))
|
.filter(v -> StrUtil.isNotBlank(v.getDescription()))
|
||||||
|
|
@ -115,11 +117,17 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
|
||||||
for (DictionaryItem it : initial) {
|
for (DictionaryItem it : initial) {
|
||||||
List<TicketSolution> values = groupedSolutions.get(it.getId());
|
List<TicketSolution> values = groupedSolutions.get(it.getId());
|
||||||
if (CollectionUtil.isEmpty(values)) {
|
if (CollectionUtil.isEmpty(values)) {
|
||||||
items.add(new SolutionMeasuresItemVO().setId(it.getId()).setName(it.getName()).setItems(Collections.emptyList()));
|
items.add(new SolutionMeasuresItemVO()
|
||||||
|
.setId(it.getId())
|
||||||
|
.setName(it.getName())
|
||||||
|
.setType(it.getValue())
|
||||||
|
.setItems(Collections.emptyList())
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
items.add(new SolutionMeasuresItemVO()
|
items.add(new SolutionMeasuresItemVO()
|
||||||
.setId(it.getId())
|
.setId(it.getId())
|
||||||
.setName(it.getName())
|
.setName(it.getName())
|
||||||
|
.setType(it.getValue())
|
||||||
.setItems(values.stream().map(v -> new SolutionMeasuresDataItemVO()
|
.setItems(values.stream().map(v -> new SolutionMeasuresDataItemVO()
|
||||||
.setId(Long.valueOf(v.getId()))
|
.setId(Long.valueOf(v.getId()))
|
||||||
.setName(v.getDescription())
|
.setName(v.getDescription())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue