MIFOSX-2039
This commit is contained in:
+13
-59
@@ -62,9 +62,11 @@ public class SearchReadPlatformServiceImpl implements SearchReadPlatformService
|
||||
|
||||
final MapSqlParameterSource params = new MapSqlParameterSource();
|
||||
params.addValue("hierarchy", hierarchy + "%");
|
||||
params.addValue("search", searchConditions.getSearchQuery());
|
||||
params.addValue("partialSearch", "%" + searchConditions.getSearchQuery() + "%");
|
||||
|
||||
if(searchConditions.getExactMatch()){
|
||||
params.addValue("search", searchConditions.getSearchQuery());
|
||||
}else{
|
||||
params.addValue("search", "%" + searchConditions.getSearchQuery() + "%");
|
||||
}
|
||||
return this.namedParameterjdbcTemplate.query(rm.searchSchema(searchConditions), params, rm);
|
||||
}
|
||||
|
||||
@@ -73,79 +75,29 @@ public class SearchReadPlatformServiceImpl implements SearchReadPlatformService
|
||||
public String searchSchema(final SearchConditions searchConditions) {
|
||||
|
||||
final String union = " union ";
|
||||
final String clientExactMatchSql = " (select 'CLIENT' as entityType, c.id as entityId, c.display_name as entityName, c.external_id as entityExternalId, c.account_no as entityAccountNo "
|
||||
final String clientMatchSql = " (select 'CLIENT' as entityType, c.id as entityId, c.display_name as entityName, c.external_id as entityExternalId, c.account_no as entityAccountNo "
|
||||
+ " , c.office_id as parentId, o.name as parentName, c.mobile_no as entityMobileNo,c.status_enum as entityStatusEnum, null as parentType "
|
||||
+ " from m_client c join m_office o on o.id = c.office_id where o.hierarchy like :hierarchy and (c.account_no like :search or c.display_name like :search or c.external_id like :search or c.mobile_no like :search)) ";
|
||||
|
||||
final String clientMatchSql = " (select 'CLIENT' as entityType, c.id as entityId, c.display_name as entityName, c.external_id as entityExternalId, c.account_no as entityAccountNo "
|
||||
+ " , c.office_id as parentId, o.name as parentName,c.mobile_no as entityMobileNo, c.status_enum as entityStatusEnum, null as parentType "
|
||||
+ " from m_client c join m_office o on o.id = c.office_id where o.hierarchy like :hierarchy and (c.account_no like :partialSearch and c.account_no not like :search) or "
|
||||
+ "(c.display_name like :partialSearch and c.display_name not like :search) or "
|
||||
+ "(c.external_id like :partialSearch and c.external_id not like :search)or"
|
||||
+ "(c.mobile_no like :partialSearch and c.mobile_no not like :search))";
|
||||
|
||||
final String loanExactMatchSql = " (select 'LOAN' as entityType, l.id as entityId, pl.name as entityName, l.external_id as entityExternalId, l.account_no as entityAccountNo "
|
||||
final String loanMatchSql = " (select 'LOAN' as entityType, l.id as entityId, pl.name as entityName, l.external_id as entityExternalId, l.account_no as entityAccountNo "
|
||||
+ " , IFNULL(c.id,g.id) as parentId, IFNULL(c.display_name,g.display_name) as parentName, null as entityMobileNo, l.loan_status_id as entityStatusEnum, IF(g.id is null, 'client', 'group') as parentType "
|
||||
+ " from m_loan l left join m_client c on l.client_id = c.id left join m_group g ON l.group_id = g.id left join m_office o on o.id = c.office_id left join m_product_loan pl on pl.id=l.product_id where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy) and (l.account_no like :search or l.external_id like :search)) ";
|
||||
|
||||
final String loanMatchSql = " (select 'LOAN' as entityType, l.id as entityId, pl.name as entityName, l.external_id as entityExternalId, l.account_no as entityAccountNo "
|
||||
+ " , IFNULL(c.id,g.id) as parentId, IFNULL(c.display_name,g.display_name) as parentName, null as entityMobileNo, l.loan_status_id as entityStatusEnum, IF(g.id is null, 'client', 'group') as parentType "
|
||||
+ " from m_loan l left join m_client c on l.client_id = c.id left join m_group g ON l.group_id = g.id left join m_office o on o.id = c.office_id left join m_product_loan pl on pl.id=l.product_id where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy) and "
|
||||
+ " ((l.account_no like :partialSearch and l.account_no not like :search) or (l.external_id like :partialSearch and l.external_id not like :search))) ";
|
||||
|
||||
final String savingExactMatchSql = " (select 'SAVING' as entityType, s.id as entityId, sp.name as entityName, s.external_id as entityExternalId, s.account_no as entityAccountNo "
|
||||
+ " , IFNULL(c.id,g.id) as parentId, IFNULL(c.display_name,g.display_name) as parentName, null as entityMobileNo, s.status_enum as entityStatusEnum, IF(g.id is null, 'client', 'group') as parentType "
|
||||
+ " from m_savings_account s left join m_client c on s.client_id = c.id left join m_group g ON s.group_id = g.id left join m_office o on o.id = c.office_id left join m_savings_product sp on sp.id=s.product_id "
|
||||
+ " where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy) and (s.account_no like :search or s.external_id like :search)) ";
|
||||
|
||||
final String savingMatchSql = " (select 'SAVING' as entityType, s.id as entityId, sp.name as entityName, s.external_id as entityExternalId, s.account_no as entityAccountNo "
|
||||
+ " , IFNULL(c.id,g.id) as parentId, IFNULL(c.display_name,g.display_name) as parentName, null as entityMobileNo, s.status_enum as entityStatusEnum, IF(g.id is null, 'client', 'group') as parentType "
|
||||
+ " from m_savings_account s left join m_client c on s.client_id = c.id left join m_group g ON s.group_id = g.id left join m_office o on o.id = c.office_id left join m_savings_product sp on sp.id=s.product_id "
|
||||
+ " where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy) and (s.account_no like :partialSearch and s.account_no not like :search) or "
|
||||
+ "(s.external_id like :partialSearch and s.external_id not like :search)) ";
|
||||
|
||||
final String clientIdentifierExactMatchSql = " (select 'CLIENTIDENTIFIER' as entityType, ci.id as entityId, ci.document_key as entityName, "
|
||||
+ " where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy) and (s.account_no like :search or s.external_id like :search)) ";
|
||||
|
||||
final String clientIdentifierMatchSql = " (select 'CLIENTIDENTIFIER' as entityType, ci.id as entityId, ci.document_key as entityName, "
|
||||
+ " null as entityExternalId, null as entityAccountNo, c.id as parentId, c.display_name as parentName,null as entityMobileNo, c.status_enum as entityStatusEnum, null as parentType "
|
||||
+ " from m_client_identifier ci join m_client c on ci.client_id=c.id join m_office o on o.id = c.office_id "
|
||||
+ " where o.hierarchy like :hierarchy and ci.document_key like :search ) ";
|
||||
|
||||
final String clientIdentifierMatchSql = " (select 'CLIENTIDENTIFIER' as entityType, ci.id as entityId, ci.document_key as entityName, "
|
||||
+ " null as entityExternalId, null as entityAccountNo, c.id as parentId, c.display_name as parentName,null as entityMobileNo ,c.status_enum as entityStatusEnum, null as parentType "
|
||||
+ " from m_client_identifier ci join m_client c on ci.client_id=c.id join m_office o on o.id = c.office_id "
|
||||
+ " where o.hierarchy like :hierarchy and (ci.document_key like :partialSearch and ci.document_key not like :search))";
|
||||
|
||||
final String groupExactMatchSql = " (select IF(g.level_id=1,'CENTER','GROUP') as entityType, g.id as entityId, g.display_name as entityName, g.external_id as entityExternalId, g.account_no as entityAccountNo "
|
||||
+ " , g.office_id as parentId, o.name as parentName, null as entityMobileNo, g.status_enum as entityStatusEnum, null as parentType "
|
||||
+ " from m_group g join m_office o on o.id = g.office_id where o.hierarchy like :hierarchy and (g.account_no like :search or g.display_name like :search or g.external_id like :search or g.id like :search )) ";
|
||||
|
||||
final String groupMatchSql = " (select IF(g.level_id=1,'CENTER','GROUP') as entityType, g.id as entityId, g.display_name as entityName, g.external_id as entityExternalId, g.account_no as entityAccountNo "
|
||||
+ " , g.office_id as parentId, o.name as parentName, null as entityMobileNo, g.status_enum as entityStatusEnum, null as parentType "
|
||||
+ " from m_group g join m_office o on o.id = g.office_id where o.hierarchy like :hierarchy and (g.account_no like :partialSearch and g.account_no not like :search) or (g.display_name like :partialSearch and g.display_name not like :search) or(g.external_id like :partialSearch and g.external_id not like :search) or (g.id like :partialSearch and g.id not like :search)) ";
|
||||
|
||||
+ " from m_group g join m_office o on o.id = g.office_id where o.hierarchy like :hierarchy and (g.account_no like :search or g.display_name like :search or g.external_id like :search or g.id like :search )) ";
|
||||
final StringBuffer sql = new StringBuffer();
|
||||
|
||||
// first include all exact matches
|
||||
if (searchConditions.isClientSearch()) {
|
||||
sql.append(clientExactMatchSql).append(union);
|
||||
}
|
||||
|
||||
if (searchConditions.isLoanSeach()) {
|
||||
sql.append(loanExactMatchSql).append(union);
|
||||
}
|
||||
|
||||
if (searchConditions.isSavingSeach()) {
|
||||
sql.append(savingExactMatchSql).append(union);
|
||||
}
|
||||
|
||||
if (searchConditions.isClientIdentifierSearch()) {
|
||||
sql.append(clientIdentifierExactMatchSql).append(union);
|
||||
}
|
||||
|
||||
if (searchConditions.isGroupSearch()) {
|
||||
sql.append(groupExactMatchSql).append(union);
|
||||
}
|
||||
|
||||
// include all matching records
|
||||
if (searchConditions.isClientSearch()) {
|
||||
sql.append(clientMatchSql).append(union);
|
||||
}
|
||||
@@ -166,6 +118,8 @@ public class SearchReadPlatformServiceImpl implements SearchReadPlatformService
|
||||
sql.append(groupMatchSql).append(union);
|
||||
}
|
||||
|
||||
|
||||
|
||||
sql.replace(sql.lastIndexOf(union), sql.length(), "");
|
||||
|
||||
// remove last occurrence of "union all" string
|
||||
|
||||
Reference in New Issue
Block a user