|
@@ -93,14 +93,21 @@ public class HomeController {
|
|
|
homeBlocks.setOrderNum(MassageConstants.INTEGER_ZERO);
|
|
|
homeBlocks.setTurnover(BigDecimal.ZERO);
|
|
|
}
|
|
|
+
|
|
|
Optional<Integer> upOrderNum = blockOrder.stream().min(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getOrderNum()).orElse(MassageConstants.INTEGER_ZERO));
|
|
|
homeBlocks.setUpOrderNum(upOrderNum.orElse(MassageConstants.INTEGER_ZERO));
|
|
|
|
|
|
Optional<BigDecimal> upTurnover = blockOrder.stream().min(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getTurnover()).orElse(BigDecimal.ZERO));
|
|
|
homeBlocks.setUpTurnover(upTurnover.orElse(BigDecimal.ZERO));
|
|
|
|
|
|
- Optional<BigDecimal> getAmountMax = blockAmount.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getGetAmount()).orElse(BigDecimal.ZERO));
|
|
|
- homeBlocks.setGetAmount(getAmountMax.orElse(BigDecimal.ZERO));
|
|
|
+
|
|
|
+
|
|
|
+ if(blockAmount.size()>1){
|
|
|
+ Optional<BigDecimal> getAmountMax = blockAmount.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getGetAmount()).orElse(BigDecimal.ZERO));
|
|
|
+ homeBlocks.setGetAmount(getAmountMax.orElse(BigDecimal.ZERO));
|
|
|
+ }else{
|
|
|
+ homeBlocks.setGetAmount(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
Optional<BigDecimal> getupAmount = blockAmount.stream().min(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getGetAmount()).orElse(BigDecimal.ZERO));
|
|
|
homeBlocks.setUpGetAmount(getupAmount.orElse(BigDecimal.ZERO));
|
|
|
|