|
@@ -232,7 +232,7 @@ public class SalesBoardServiceImpl implements SalesBoardService {
|
|
})
|
|
})
|
|
);
|
|
);
|
|
|
|
|
|
- bomSalesBoardVo.setBomSpecSalesList(new ArrayList<>(bomSpecSalesMap.values()));
|
|
|
|
|
|
+ bomSalesBoardVo.setBomSpecSalesList(bomSpecSalesMap.values().stream().sorted(comparing(DailyBoardOutStorageBomVo::getQuantity).reversed()).collect(Collectors.toList()));
|
|
BigDecimal bomSpecSalesCount = bomSalesBoardVo.getBomSpecSalesList().stream().map(DailyBoardOutStorageBomVo::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
BigDecimal bomSpecSalesCount = bomSalesBoardVo.getBomSpecSalesList().stream().map(DailyBoardOutStorageBomVo::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
bomSalesBoardVo.setBomSpecSalesCount(bomSpecSalesCount);
|
|
bomSalesBoardVo.setBomSpecSalesCount(bomSpecSalesCount);
|
|
list.add(bomSalesBoardVo);
|
|
list.add(bomSalesBoardVo);
|
|
@@ -256,7 +256,7 @@ public class SalesBoardServiceImpl implements SalesBoardService {
|
|
DepartmentBomSalesBoardVo sumBomVo = new DepartmentBomSalesBoardVo();
|
|
DepartmentBomSalesBoardVo sumBomVo = new DepartmentBomSalesBoardVo();
|
|
sumBomVo.setDepartmentName("");
|
|
sumBomVo.setDepartmentName("");
|
|
sumBomVo.setOrderSalesCount(orderList.size());
|
|
sumBomVo.setOrderSalesCount(orderList.size());
|
|
- sumBomVo.setBomSpecSalesList(new ArrayList<>(sumBomMap.values()));
|
|
|
|
|
|
+ sumBomVo.setBomSpecSalesList(sumBomMap.values().stream().sorted(comparing(DailyBoardOutStorageBomVo::getQuantity).reversed()).collect(Collectors.toList()));
|
|
BigDecimal sumBomSpecSalesCount = sumBomVo.getBomSpecSalesList().stream().map(DailyBoardOutStorageBomVo::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
BigDecimal sumBomSpecSalesCount = sumBomVo.getBomSpecSalesList().stream().map(DailyBoardOutStorageBomVo::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
sumBomVo.setBomSpecSalesCount(sumBomSpecSalesCount);
|
|
sumBomVo.setBomSpecSalesCount(sumBomSpecSalesCount);
|
|
list.add(0, sumBomVo);
|
|
list.add(0, sumBomVo);
|