提交 c4278613 authored 作者: zhoushaopan's avatar zhoushaopan

fix(统计模块): 排序已退役,已报废,已销毁统计数量

排序已退役,已报废,已销毁统计数量
上级 6cd16d3a
......@@ -42,6 +42,7 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.toMap;
@RestController
@Api(tags = "统计业务模块", description = "统计相关接口")
......@@ -312,7 +313,13 @@ public class StatisticalController {
List<ScrappedDestroyedRetiredVo> destroyedRetiredVoList = new ArrayList<>();
if (lifeStatus.containsAll(deviceLibrarySelectVo.getLifeStatus())){
//进行组合
Map<String, List<DeviceLibrary>> map = libraryList.stream().collect(groupingBy(deviceLibrary -> deviceLibrary.getModel() + "Ǵ" + deviceLibrary.getName() + "Ǵ" + deviceLibrary.getMatchingRangeName()+"Ǵ"+deviceLibrary.getIsPart()));
// Map<String, List<DeviceLibrary>> map = libraryList.stream()
// .collect(groupingBy(deviceLibrary -> deviceLibrary.getModel() + "Ǵ" + deviceLibrary.getName() + "Ǵ" +
// deviceLibrary.getMatchingRangeName()+"Ǵ"+deviceLibrary.getIsPart()));
LinkedHashMap<String, List<DeviceLibrary>> map =
libraryList.stream().collect(groupingBy(deviceLibrary -> deviceLibrary.getModel() + "Ǵ"
+ deviceLibrary.getName() + "Ǵ" + deviceLibrary.getMatchingRangeName() + "Ǵ" + deviceLibrary.getIsPart(),
LinkedHashMap::new, Collectors.toList()));
if (map.size()>0){
for (String s : map.keySet()) {
String[] strings = s.split("Ǵ");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论