Merge pull request #846 from egovernments/develop-ISTE-177

updated fromDate and toDate code
egovernments · Jul 4, 2024 · 99d02c8 · 99d02c8
2 parents 075e76a + 89a380e
commit 99d02c8
Showing 1 changed file with 2 additions and 2 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
@@ -670,13 +670,13 @@ public StringBuilder applyFiltersForPlaneSearch(StringBuilder query, List<Object
 				query.append(" conn.tenantid = ? ");
 				preparedStatement.add(criteria.getTenantId());
 			}
-			addClauseIfRequired(preparedStatement, query);
 			if(criteria.getFromDate()!=null){
+				addClauseIfRequired(preparedStatement, query);
 				query.append(" conn.createdtime>=? ");
 				preparedStatement.add(criteria.getFromDate());
 			}
-			addClauseIfRequired(preparedStatement, query);
 			if(criteria.getToDate()!=null){
+				addClauseIfRequired(preparedStatement, query);
 				query.append(" conn.createdtime<=?");
 				preparedStatement.add(criteria.getToDate());
 			}