Merge pull request #842 from egovernments/ISTE-226

Iste 226
egovernments · Jul 3, 2024 · b3a6d15 · b3a6d15
2 parents bc2c270 + 1864170
commit b3a6d15
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/...ws-services/src/main/java/org/egov/waterconnection/repository/builder/WsQueryBuilder.java b/...ws-services/src/main/java/org/egov/waterconnection/repository/builder/WsQueryBuilder.java
@@ -23,6 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
@@ -281,25 +282,40 @@ public StringBuilder applyFilters(StringBuilder query, List<Object> preparedStat
 			preparedStatement.add(criteria.getOldConnectionNumber());
 		}
 
-		if (!StringUtils.isEmpty(criteria.getConnectionNumber()) || !StringUtils.isEmpty(criteria.getTextSearch())) {
-			addClauseIfRequired(preparedStatement, query);
-
-			if(!StringUtils.isEmpty(criteria.getConnectionNumber())) {
-				query.append(" conn.connectionno ~*  ? ");
-				preparedStatement.add(criteria.getConnectionNumber());
-			}
-			else {
-				query.append(" conn.connectionno ~*  ? ");
-				preparedStatement.add(criteria.getTextSearch());
+		if(ObjectUtils.isEmpty(criteria.getIsOpenPaymentSearch()) || !criteria.getIsOpenPaymentSearch()) {
+
+			if (!StringUtils.isEmpty(criteria.getConnectionNumber()) || !StringUtils.isEmpty(criteria.getTextSearch())) {
+				addClauseIfRequired(preparedStatement, query);
+
+				if (!StringUtils.isEmpty(criteria.getConnectionNumber())) {
+					query.append(" conn.connectionno ~*  ? ");
+					preparedStatement.add(criteria.getConnectionNumber());
+				} else {
+					query.append(" conn.connectionno ~*  ? ");
+					preparedStatement.add(criteria.getTextSearch());
+				}
+
+
+				if (!CollectionUtils.isEmpty(criteria.getConnectionNoSet())) {
+					query.append(" or conn.connectionno in (").append(createQuery(criteria.getConnectionNoSet())).append(" )");
+					addToPreparedStatement(preparedStatement, criteria.getConnectionNoSet());
+				}
 			}
-			
+		} else {
 
-			if(!CollectionUtils.isEmpty(criteria.getConnectionNoSet())) {
-				query.append(" or conn.connectionno in (").append(createQuery(criteria.getConnectionNoSet())).append(" )");
-				addToPreparedStatement(preparedStatement, criteria.getConnectionNoSet());
+			if (!StringUtils.isEmpty(criteria.getConnectionNumber())){
+				addClauseIfRequired(preparedStatement, query);
+				query.append(" conn.connectionno =  ? ");
+				preparedStatement.add(criteria.getConnectionNumber());
 			}
 		}
 
+		if (!CollectionUtils.isEmpty(criteria.getConnectionNoSet())) {
+			addClauseIfRequired(preparedStatement, query);
+			query.append(" conn.connectionno in (").append(createQuery(criteria.getConnectionNoSet())).append(" )");
+			addToPreparedStatement(preparedStatement, criteria.getConnectionNoSet());
+		}
+
 		if (!StringUtils.isEmpty(criteria.getStatus())) {
 			addClauseIfRequired(preparedStatement, query);
 			query.append(" conn.status = ? ");

diff --git a/...ervices/ws-services/src/main/java/org/egov/waterconnection/web/models/SearchCriteria.java b/...ervices/ws-services/src/main/java/org/egov/waterconnection/web/models/SearchCriteria.java
@@ -32,6 +32,9 @@ public class SearchCriteria {
 
 	private Set<String> userIds;
 
+	@JsonProperty("isOpenPaymentSearch")
+	private Boolean isOpenPaymentSearch;
+
 	@JsonProperty("status")
 	private String status;