Merge pull request #845 from egovernments/ISTE-177

added fromDate,toDate search criteria for planesearch for reindexing
egovernments · Jul 3, 2024 · 9157e7a · 9157e7a
2 parents 6dd413a + c086f5d
commit 9157e7a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/business-services/billing-service/src/main/java/org/egov/demand/model/DemandCriteria.java b/business-services/billing-service/src/main/java/org/egov/demand/model/DemandCriteria.java
@@ -76,6 +76,10 @@ public class DemandCriteria {
 	private Long periodFrom;
 
 	private Long periodTo;
+
+	private Long fromDate;
+
+	private Long toDate;
 
 	private Type type;
 

diff --git a/...ing-service/src/main/java/org/egov/demand/repository/querybuilder/DemandQueryBuilder.java b/...ing-service/src/main/java/org/egov/demand/repository/querybuilder/DemandQueryBuilder.java
@@ -260,6 +260,18 @@ public void addDemandCriteria(StringBuilder demandQuery, DemandCriteria demandCr
 			preparedStatementValues.add(demandCriteria.getPeriodTo());
 		}
 
+		if(demandCriteria.getFromDate() != null){
+			addAndClause(demandQuery);
+			demandQuery.append(" dmd.createdtime >= ? ");
+			preparedStatementValues.add(demandCriteria.getFromDate());
+		}
+
+		if(demandCriteria.getToDate() != null){
+			addAndClause(demandQuery);
+			demandQuery.append(" dmd.createdtime <= ? ");
+			preparedStatementValues.add(demandCriteria.getToDate());
+		}
+
 		if (demandCriteria.getConsumerCode() != null && !demandCriteria.getConsumerCode().isEmpty()) {
 			addAndClause(demandQuery);
 			demandQuery.append("dmd.consumercode IN ("