feat:数据块提现bug

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/HomeController.java

@@ -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));
 

nightFragrance-massage/src/main/resources/mapper/massage/TTxRecordMapper.xml

@@ -34,6 +34,7 @@
         <if test="deptId != null and deptId != 100 and deptId != ''">
             AND dept_id = #{deptId}
         </if>
+        AND dt_create_time BETWEEN #{start} AND #{end}
         GROUP BY
             MONTH
         ORDER BY