Merge remote-tracking branch 'origin/master'

hx-account/src/main/java/com/fjhx/account/service/account/impl/StatementServiceImpl.java

@@ -194,7 +194,7 @@ public class StatementServiceImpl implements StatementService {
         List<Long> managementIdList = managementList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
 
         return accountRunningWaterService.list(q -> q
-                .ge(BasePo::getCreateTime, beginDate)
+                .ge(AccountRunningWater::getTransactionTime, beginDate)
                 .in(AccountRunningWater::getAccountManagementId, managementIdList)
         );
 
@@ -229,7 +229,7 @@ public class StatementServiceImpl implements StatementService {
 
             // 计算结束时间至今金额改变值
             BigDecimal reduce = itemRunningWaterList.stream()
-                    .filter(item -> item.getCreateTime().after(endDate))
+                    .filter(item -> item.getTransactionTime().after(endDate))
                     .map(item -> Objects.equals(item.getStatus(), "10") ? BigDecimal.ZERO.subtract(item.getAmount()) : item.getAmount())
                     .reduce(BigDecimal.ZERO, BigDecimal::add);