소스 검색

融资管理文件下载功能开发

liuj 6 달 전
부모
커밋
7f1f644bae
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      src/main/java/com/sunxung/factoring/service/ledger/impl/LedgerManagementServiceImpl.java

+ 2 - 1
src/main/java/com/sunxung/factoring/service/ledger/impl/LedgerManagementServiceImpl.java

@@ -438,7 +438,8 @@ public class LedgerManagementServiceImpl implements LedgerManagementService {
             List<LedgerPlanFactoringAssign> planFactoringAssignList = planFactoringAssignService.findByFundGoodsAssignId(ledgerFundGoodsAssign.getId());
             if (planFactoringAssignList != null && planFactoringAssignList.size() > 0) {
                 if (cashTypeCode.equals(financingAmountDict.getCode())) {
-                    planFactoringAssignList = planFactoringAssignList.stream().filter(p -> p.getActualDate() != null && DateUtil.compare(p.getActualDate(), ledgerAccountBasicInfo.getLedgerDate()) == 0)
+                    planFactoringAssignList = planFactoringAssignList.stream().filter(p -> p.getActualDate() != null
+                                    && (DateUtil.isSameDay(p.getActualDate(), ledgerAccountBasicInfo.getLedgerDate()) || DateUtil.isSameDay(p.getActualDate(), new Date())))
                             .filter(p -> p.getActualAmount().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
                 }
                 //向sop同步现金流入账数据