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

Merge pull request #1019 from cgninan/MIFOSX-1395

Browse Source 
MIFOSX-1395 - Add Loan/Savings Product Short Name in ClientAccounts Resp...
This commit is contained in:
Vishwas Babu A J
2014-07-18 19:12:06 -07:00
parent 3f35a3e4cf 5b909305c2
commit d45270c413
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/LoanAccountSummaryData.java
+3 -1
View File
@@ -20,6 +20,7 @@ public class LoanAccountSummaryData {
private final String externalId; private final String externalId;
private final Long productId; private final Long productId;
private final String productName; private final String productName;
private final String shortProductName;
private final LoanStatusEnumData status; private final LoanStatusEnumData status;
private final EnumOptionData loanType; private final EnumOptionData loanType;
private final Integer loanCycle; private final Integer loanCycle;
@@ -27,13 +28,14 @@ public class LoanAccountSummaryData {
private final Boolean inArrears; private final Boolean inArrears;
public LoanAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId, public LoanAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId,
final String loanProductName, final LoanStatusEnumData loanStatus, final EnumOptionData loanType, final Integer loanCycle, final String loanProductName, final String shortLoanProductName, final LoanStatusEnumData loanStatus, final EnumOptionData loanType, final Integer loanCycle,
final LoanApplicationTimelineData timeline, final Boolean inArrears) { final LoanApplicationTimelineData timeline, final Boolean inArrears) {
this.id = id; this.id = id;
this.accountNo = accountNo; this.accountNo = accountNo;
this.externalId = externalId; this.externalId = externalId;
this.productId = productId; this.productId = productId;
this.productName = loanProductName; this.productName = loanProductName;
this.shortProductName = shortLoanProductName;
this.status = loanStatus; this.status = loanStatus;
this.loanType = loanType; this.loanType = loanType;
this.loanCycle = loanCycle; this.loanCycle = loanCycle;
mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/data/SavingsAccountSummaryData.java
+3 -1
View File
@@ -23,6 +23,7 @@ public class SavingsAccountSummaryData {
private final String externalId; private final String externalId;
private final Long productId; private final Long productId;
private final String productName; private final String productName;
private final String shortProductName;
private final SavingsAccountStatusEnumData status; private final SavingsAccountStatusEnumData status;
private final CurrencyData currency; private final CurrencyData currency;
private final BigDecimal accountBalance; private final BigDecimal accountBalance;
@@ -34,13 +35,14 @@ public class SavingsAccountSummaryData {
private final EnumOptionData depositType; private final EnumOptionData depositType;
public SavingsAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId, public SavingsAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId,
final String productName, final SavingsAccountStatusEnumData status, final CurrencyData currency, final String productName, final String shortProductName, final SavingsAccountStatusEnumData status, final CurrencyData currency,
final BigDecimal accountBalance, final EnumOptionData accountType, final SavingsAccountApplicationTimelineData timeline, final EnumOptionData depositType) { final BigDecimal accountBalance, final EnumOptionData accountType, final SavingsAccountApplicationTimelineData timeline, final EnumOptionData depositType) {
this.id = id; this.id = id;
this.accountNo = accountNo; this.accountNo = accountNo;
this.externalId = externalId; this.externalId = externalId;
this.productId = productId; this.productId = productId;
this.productName = productName; this.productName = productName;
this.shortProductName = shortProductName;
this.status = status; this.status = status;
this.currency = currency; this.currency = currency;
this.accountBalance = accountBalance; this.accountBalance = accountBalance;
mifosng-provider/src/main/java/org/mifosplatform/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java
+6 -4
View File
@@ -141,7 +141,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou
.append("sa.currency_code as currencyCode, sa.currency_digits as currencyDigits, sa.currency_multiplesof as inMultiplesOf, "); .append("sa.currency_code as currencyCode, sa.currency_digits as currencyDigits, sa.currency_multiplesof as inMultiplesOf, ");
accountsSummary.append("curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, "); accountsSummary.append("curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, ");
accountsSummary.append("curr.display_symbol as currencyDisplaySymbol, "); accountsSummary.append("curr.display_symbol as currencyDisplaySymbol, ");
accountsSummary.append("sa.product_id as productId, p.name as productName, "); accountsSummary.append("sa.product_id as productId, p.name as productName, p.short_name as shortProductName, ");
accountsSummary.append("sa.deposit_type_enum as depositType "); accountsSummary.append("sa.deposit_type_enum as depositType ");
accountsSummary.append("from m_savings_account sa "); accountsSummary.append("from m_savings_account sa ");
accountsSummary.append("join m_savings_product as p on p.id = sa.product_id "); accountsSummary.append("join m_savings_product as p on p.id = sa.product_id ");
@@ -168,6 +168,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou
final String externalId = rs.getString("externalId"); final String externalId = rs.getString("externalId");
final Long productId = JdbcSupport.getLong(rs, "productId"); final Long productId = JdbcSupport.getLong(rs, "productId");
final String productName = rs.getString("productName"); final String productName = rs.getString("productName");
final String shortProductName = rs.getString("shortProductName");
final Integer statusId = JdbcSupport.getInteger(rs, "statusEnum"); final Integer statusId = JdbcSupport.getInteger(rs, "statusEnum");
final BigDecimal accountBalance = JdbcSupport.getBigDecimalDefaultToNullIfZero(rs, "accountBalance"); final BigDecimal accountBalance = JdbcSupport.getBigDecimalDefaultToNullIfZero(rs, "accountBalance");
final SavingsAccountStatusEnumData status = SavingsEnumerations.status(statusId); final SavingsAccountStatusEnumData status = SavingsEnumerations.status(statusId);
@@ -222,7 +223,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou
activatedByUsername, activatedByFirstname, activatedByLastname, closedOnDate, closedByUsername, closedByFirstname, activatedByUsername, activatedByFirstname, activatedByLastname, closedOnDate, closedByUsername, closedByFirstname,
closedByLastname); closedByLastname);
return new SavingsAccountSummaryData(id, accountNo, externalId, productId, productName, status, currency, accountBalance, return new SavingsAccountSummaryData(id, accountNo, externalId, productId, productName, shortProductName, status, currency, accountBalance,
accountTypeData, timeline, depositTypeData); accountTypeData, timeline, depositTypeData);
} }
} }
@@ -233,7 +234,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou
final StringBuilder accountsSummary = new StringBuilder("l.id as id, l.account_no as accountNo, l.external_id as externalId,"); final StringBuilder accountsSummary = new StringBuilder("l.id as id, l.account_no as accountNo, l.external_id as externalId,");
accountsSummary accountsSummary
.append(" l.product_id as productId, lp.name as productName,") .append(" l.product_id as productId, lp.name as productName, lp.short_name as shortProductName,")
.append(" l.loan_status_id as statusId, l.loan_type_enum as loanType,") .append(" l.loan_status_id as statusId, l.loan_type_enum as loanType,")
.append(" l.loan_product_counter as loanCycle,") .append(" l.loan_product_counter as loanCycle,")
@@ -277,6 +278,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou
final String externalId = rs.getString("externalId"); final String externalId = rs.getString("externalId");
final Long productId = JdbcSupport.getLong(rs, "productId"); final Long productId = JdbcSupport.getLong(rs, "productId");
final String loanProductName = rs.getString("productName"); final String loanProductName = rs.getString("productName");
final String shortLoanProductName = rs.getString("shortProductName");
final Integer loanStatusId = JdbcSupport.getInteger(rs, "statusId"); final Integer loanStatusId = JdbcSupport.getInteger(rs, "statusId");
final LoanStatusEnumData loanStatus = LoanEnumerations.status(loanStatusId); final LoanStatusEnumData loanStatus = LoanEnumerations.status(loanStatusId);
final Integer loanTypeId = JdbcSupport.getInteger(rs, "loanType"); final Integer loanTypeId = JdbcSupport.getInteger(rs, "loanType");
@@ -331,7 +333,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou
disbursedByFirstname, disbursedByLastname, closedOnDate, closedByUsername, closedByFirstname, closedByLastname, disbursedByFirstname, disbursedByLastname, closedOnDate, closedByUsername, closedByFirstname, closedByLastname,
expectedMaturityDate, writtenOffOnDate, closedByUsername, closedByFirstname, closedByLastname); expectedMaturityDate, writtenOffOnDate, closedByUsername, closedByFirstname, closedByLastname);
return new LoanAccountSummaryData(id, accountNo, externalId, productId, loanProductName, loanStatus, loanType, loanCycle, return new LoanAccountSummaryData(id, accountNo, externalId, productId, loanProductName, shortLoanProductName, loanStatus, loanType, loanCycle,
timeline, inArrears); timeline, inArrears);
} }
} }