diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionMeasuresItemVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionMeasuresItemVO.java index aef309fe..1cb0a13f 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionMeasuresItemVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionMeasuresItemVO.java @@ -24,6 +24,11 @@ public class SolutionMeasuresItemVO { @NotBlank private String name; + /** + * 措施分类类型 + */ + private String type; + /** * 具体的措施 */ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java index 6239d670..b7e43055 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java @@ -93,11 +93,13 @@ public class TicketSolutionServiceImpl extends ServiceImpl new SolutionMeasuresItemVO() .setId(it.getId()) .setName(it.getName()) + .setType(it.getValue()) .setItems(Collections.emptyList())) .collect(Collectors.toList()); } else if (CollectionUtil.isEmpty(initial)) { items = groupedSolutions.entrySet().stream().map(ks -> new SolutionMeasuresItemVO() .setName(ks.getValue().get(0).getDictionaryItemName()) + .setType(ks.getValue().get(0).getDictionaryItemName()) .setItems(ks.getValue() .stream() .filter(v -> StrUtil.isNotBlank(v.getDescription())) @@ -115,11 +117,17 @@ public class TicketSolutionServiceImpl extends ServiceImpl values = groupedSolutions.get(it.getId()); 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 { items.add(new SolutionMeasuresItemVO() .setId(it.getId()) .setName(it.getName()) + .setType(it.getValue()) .setItems(values.stream().map(v -> new SolutionMeasuresDataItemVO() .setId(Long.valueOf(v.getId())) .setName(v.getDescription())