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

MIFOSX-416 : display loan type for loan in Client's general details

Browse Source
This commit is contained in:
ashok-conflux
2013-06-05 14:59:04 +05:30
parent 4059e1900a
commit 997fd4d3e2
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientAccountSummaryData.java
+17
View File
@@ -5,6 +5,7 @@
*/ */
package org.mifosplatform.portfolio.client.data; package org.mifosplatform.portfolio.client.data;
import org.mifosplatform.infrastructure.core.data.EnumOptionData;
import org.mifosplatform.portfolio.loanaccount.data.LoanStatusEnumData; import org.mifosplatform.portfolio.loanaccount.data.LoanStatusEnumData;
/** /**
@@ -25,6 +26,8 @@ public class ClientAccountSummaryData {
private final Integer accountStatusId; private final Integer accountStatusId;
private final LoanStatusEnumData status; private final LoanStatusEnumData status;
@SuppressWarnings("unused")
private final EnumOptionData loanType;
public ClientAccountSummaryData(final Long id, final String externalId, final Long productId, final String loanProductName, public ClientAccountSummaryData(final Long id, final String externalId, final Long productId, final String loanProductName,
final Integer loanStatusId) { final Integer loanStatusId) {
@@ -35,6 +38,7 @@ public class ClientAccountSummaryData {
this.productName = loanProductName; this.productName = loanProductName;
this.accountStatusId = loanStatusId; this.accountStatusId = loanStatusId;
this.status = null; this.status = null;
this.loanType = null;
} }
public ClientAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId, public ClientAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId,
@@ -46,6 +50,19 @@ public class ClientAccountSummaryData {
this.productName = loanProductName; this.productName = loanProductName;
this.accountStatusId = null; this.accountStatusId = null;
this.status = loanStatus; this.status = loanStatus;
this.loanType = null;
}
public ClientAccountSummaryData(final Long id, final String accountNo, final String externalId, final Long productId,
final String loanProductName, final LoanStatusEnumData loanStatus, final EnumOptionData loanType) {
this.id = id;
this.accountNo = accountNo;
this.externalId = externalId;
this.productId = productId;
this.productName = loanProductName;
this.accountStatusId = null;
this.status = loanStatus;
this.loanType = loanType;
} }
public Integer accountStatusId() { public Integer accountStatusId() {
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java
+4 -2
View File
@@ -476,7 +476,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
public String loanAccountSummarySchema() { public String loanAccountSummarySchema() {
StringBuilder accountsSummary = new StringBuilder("l.id as id, l.account_no as accountNo, l.external_id as externalId,"); StringBuilder accountsSummary = new StringBuilder("l.id as id, l.account_no as accountNo, l.external_id as externalId,");
accountsSummary.append("l.product_id as productId, lp.name as productName,").append("l.loan_status_id as statusId ") accountsSummary.append("l.product_id as productId, lp.name as productName,").append("l.loan_status_id as statusId, l.loan_type_enum as loanType ")
.append("from m_loan l ").append("LEFT JOIN m_product_loan AS lp ON lp.id = l.product_id "); .append("from m_loan l ").append("LEFT JOIN m_product_loan AS lp ON lp.id = l.product_id ");
return accountsSummary.toString(); return accountsSummary.toString();
@@ -492,8 +492,10 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService
final String loanProductName = rs.getString("productName"); final String loanProductName = rs.getString("productName");
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 EnumOptionData loanType = LoanEnumerations.loanType(loanTypeId);
return new ClientAccountSummaryData(id, accountNo, externalId, productId, loanProductName, loanStatus); return new ClientAccountSummaryData(id, accountNo, externalId, productId, loanProductName, loanStatus, loanType);
} }
} }