FINERACT-115 : In Loan tranche details page if any tranche is added, Tranche disbursement charge is getting added twice
This commit is contained in:
+7
-3
@@ -5869,9 +5869,13 @@ public class Loan extends AbstractPersistableCustom<Long> {
|
|||||||
return actualDisbursementDate;
|
return actualDisbursementDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addTrancheLoanCharge(Charge charge) {
|
public void addTrancheLoanCharge(final Charge charge) {
|
||||||
if (!trancheCharges.contains(charge)) {
|
final List<Charge> appliedCharges = new ArrayList<>();
|
||||||
trancheCharges.add(new LoanTrancheCharge(charge, this));
|
for(final LoanTrancheCharge loanTrancheCharge: this.trancheCharges){
|
||||||
|
appliedCharges.add(loanTrancheCharge.getCharge());
|
||||||
|
}
|
||||||
|
if (!appliedCharges.contains(charge)) {
|
||||||
|
this.trancheCharges.add(new LoanTrancheCharge(charge, this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -34,7 +34,7 @@ public class LoanTrancheDisbursementCharge extends AbstractPersistableCustom<Lon
|
|||||||
@JoinColumn(name = "loan_charge_id", referencedColumnName = "id", nullable = false)
|
@JoinColumn(name = "loan_charge_id", referencedColumnName = "id", nullable = false)
|
||||||
private LoanCharge loancharge;
|
private LoanCharge loancharge;
|
||||||
|
|
||||||
@ManyToOne(cascade = CascadeType.PERSIST, optional = false)
|
@ManyToOne(cascade = CascadeType.ALL, optional = false)
|
||||||
@JoinColumn(name="disbursement_detail_id", referencedColumnName = "id", nullable = false)
|
@JoinColumn(name="disbursement_detail_id", referencedColumnName = "id", nullable = false)
|
||||||
private LoanDisbursementDetails loanDisbursementDetails;
|
private LoanDisbursementDetails loanDisbursementDetails;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user