rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'prod/20260407' into test

This commit is contained in:
曹鹏飞 2026-04-10 10:58:44 +08:00
parent fc1de7c28f fde5a14982
commit 9c12b434c5
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/SolutionMeasuresItemVO.java
View File

@ -24,6 +24,11 @@ public class SolutionMeasuresItemVO {
@NotBlank
private String name;
/**
* 措施分类类型
*/
private String type;
/**
* 具体的措施
*/

10
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketSolutionServiceImpl.java
View File

@ -93,11 +93,13 @@ public class TicketSolutionServiceImpl extends ServiceImpl<TicketSolutionMapper,
items = initial.stream().map(it -> 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<TicketSolutionMapper,
for (DictionaryItem it : initial) {
List<TicketSolution> 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())