From fde5a149823b8ed6c4d4e8ac7d5dded740a61631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 10 Apr 2026 10:56:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pojo/vo/SolutionMeasuresItemVO.java | 5 +++++ .../service/impl/TicketSolutionServiceImpl.java | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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())