|
@@ -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同步现金流入账数据
|