CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

MIFOSX-1486 : changed the accured till date

Browse Source
This commit is contained in:
Pramod Nuthakki
2014-08-15 18:18:22 +05:30
parent debd298a13
commit c62bd61222
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java
+6 -5
View File
@@ -129,7 +129,7 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat
private void addAccrualTillSpecificDate(final LocalDate tilldate, final LoanScheduleAccrualData accrualData, private void addAccrualTillSpecificDate(final LocalDate tilldate, final LoanScheduleAccrualData accrualData,
final LocalDate accruredTill) throws Exception { final LocalDate accruredTill) throws Exception {
LocalDate interestStartDate = accrualData.getFromDateAsLocaldate(); LocalDate interestStartDate = accrualData.getFromDateAsLocaldate();
if (accrualData.getInterestCalculatedFrom() != null if (accrualData.getInterestCalculatedFrom() != null
&& accrualData.getFromDateAsLocaldate().isBefore(accrualData.getInterestCalculatedFrom())) { && accrualData.getFromDateAsLocaldate().isBefore(accrualData.getInterestCalculatedFrom())) {
if (accrualData.getInterestCalculatedFrom().isBefore(accrualData.getDueDateAsLocaldate())) { if (accrualData.getInterestCalculatedFrom().isBefore(accrualData.getDueDateAsLocaldate())) {
@@ -138,7 +138,7 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat
interestStartDate = accrualData.getDueDateAsLocaldate(); interestStartDate = accrualData.getDueDateAsLocaldate();
} }
} }
int totalNumberOfDays = Days.daysBetween(interestStartDate, accrualData.getDueDateAsLocaldate()).getDays(); int totalNumberOfDays = Days.daysBetween(interestStartDate, accrualData.getDueDateAsLocaldate()).getDays();
LocalDate startDate = accruredTill; LocalDate startDate = accruredTill;
if (startDate == null) { if (startDate == null) {
@@ -316,7 +316,7 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat
final Long transactonId = this.jdbcTemplate.queryForLong("SELECT LAST_INSERT_ID()"); final Long transactonId = this.jdbcTemplate.queryForLong("SELECT LAST_INSERT_ID()");
Map<String, Object> transactionMap = toMapData(transactonId, amount, interestportion, feeportion, penaltyportion, Map<String, Object> transactionMap = toMapData(transactonId, amount, interestportion, feeportion, penaltyportion,
scheduleAccrualData); scheduleAccrualData, accruredTill);
String repaymetUpdatesql = "UPDATE m_loan_repayment_schedule SET accrual_interest_derived=?, accrual_fee_charges_derived=?, " String repaymetUpdatesql = "UPDATE m_loan_repayment_schedule SET accrual_interest_derived=?, accrual_fee_charges_derived=?, "
+ "accrual_penalty_charges_derived=? WHERE id=?"; + "accrual_penalty_charges_derived=? WHERE id=?";
@@ -355,7 +355,8 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat
} }
public Map<String, Object> toMapData(final Long id, final BigDecimal amount, final BigDecimal interestportion, public Map<String, Object> toMapData(final Long id, final BigDecimal amount, final BigDecimal interestportion,
final BigDecimal feeportion, final BigDecimal penaltyportion, final LoanScheduleAccrualData loanScheduleAccrualData) { final BigDecimal feeportion, final BigDecimal penaltyportion, final LoanScheduleAccrualData loanScheduleAccrualData,
final LocalDate accruredTill) {
final Map<String, Object> thisTransactionData = new LinkedHashMap<>(); final Map<String, Object> thisTransactionData = new LinkedHashMap<>();
final LoanTransactionEnumData transactionType = LoanEnumerations.transactionType(LoanTransactionType.ACCRUAL); final LoanTransactionEnumData transactionType = LoanEnumerations.transactionType(LoanTransactionType.ACCRUAL);
@@ -364,7 +365,7 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat
thisTransactionData.put("officeId", loanScheduleAccrualData.getOfficeId()); thisTransactionData.put("officeId", loanScheduleAccrualData.getOfficeId());
thisTransactionData.put("type", transactionType); thisTransactionData.put("type", transactionType);
thisTransactionData.put("reversed", false); thisTransactionData.put("reversed", false);
thisTransactionData.put("date", loanScheduleAccrualData.getDueDateAsLocaldate()); thisTransactionData.put("date", accruredTill);
thisTransactionData.put("currency", loanScheduleAccrualData.getCurrencyData()); thisTransactionData.put("currency", loanScheduleAccrualData.getCurrencyData());
thisTransactionData.put("amount", amount); thisTransactionData.put("amount", amount);
thisTransactionData.put("principalPortion", null); thisTransactionData.put("principalPortion", null);