|
@@ -13,9 +13,7 @@ import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -60,7 +58,9 @@ public class CorpKfQaController {
|
|
|
qaType.setLabel(categoryName);
|
|
qaType.setLabel(categoryName);
|
|
|
qaType.setValue(categoryName);
|
|
qaType.setValue(categoryName);
|
|
|
// 假设需要将GoodsQaShowView转换为GoodsDon,此处需要具体逻辑
|
|
// 假设需要将GoodsQaShowView转换为GoodsDon,此处需要具体逻辑
|
|
|
|
|
+ Set<Long> dupGids = new HashSet<>();
|
|
|
List<GoodsQaShowView.QaGoodsType.GoodsDonQaView> goodsDons = categoryViews.stream()
|
|
List<GoodsQaShowView.QaGoodsType.GoodsDonQaView> goodsDons = categoryViews.stream()
|
|
|
|
|
+ .filter(v -> filterDupGid(v, dupGids))
|
|
|
.map(view -> convertToGoodsDon(view)) // 自定义转换方法
|
|
.map(view -> convertToGoodsDon(view)) // 自定义转换方法
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
qaType.setChildren(goodsDons);
|
|
qaType.setChildren(goodsDons);
|
|
@@ -90,4 +90,12 @@ public class CorpKfQaController {
|
|
|
goodsDonQaView.setValue(view.getGoodsId());
|
|
goodsDonQaView.setValue(view.getGoodsId());
|
|
|
return goodsDonQaView;
|
|
return goodsDonQaView;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ private boolean filterDupGid(GoodsQaShowView v, Set<Long> dupGids) {
|
|
|
|
|
+ if (dupGids.contains(v.getGoodsId())) {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ dupGids.add(v.getGoodsId());
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|