Merge branch 'dev' into hcmpre-878-stockService

egovernments · Dec 2, 2024 · 9ac4df2 · 9ac4df2
2 parents d8e04b4 + 9bba4d0
commit 9ac4df2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...ct/src/main/java/org/egov/project/repository/querybuilder/ProjectAddressQueryBuilder.java b/...ct/src/main/java/org/egov/project/repository/querybuilder/ProjectAddressQueryBuilder.java
@@ -93,6 +93,18 @@ public String getProjectSearchQuery(List<Project> projects, Integer limit, Integ
                 preparedStmtList.add(project.getProjectType());
             }
 
+            if (StringUtils.isNotBlank(project.getReferenceID())) {
+                addClauseIfRequired(preparedStmtList, queryBuilder);
+                queryBuilder.append(" prj.referenceId =? ");
+                preparedStmtList.add(project.getReferenceID());
+            }
+
+            if (StringUtils.isNotBlank(project.getParent())) {
+                addClauseIfRequired(preparedStmtList, queryBuilder);
+                queryBuilder.append(" prj.parent =? ");
+                preparedStmtList.add(project.getParent());
+            }
+
             if (project.getAddress() != null && StringUtils.isNotBlank(project.getAddress().getBoundary())) {
                 addClauseIfRequired(preparedStmtList, queryBuilder);
                 queryBuilder.append(" addr.boundary=? ");

diff --git a/health-services/stock/src/main/java/org/egov/stock/util/ValidatorUtil.java b/health-services/stock/src/main/java/org/egov/stock/util/ValidatorUtil.java
@@ -303,8 +303,6 @@ private static <T> void enrichErrorForStock(List<Stock> validEntities,
 					// If facilityIds are empty, log an error for both sender and receiver
 					populateErrorForStock(stock, senderId + " and " + receiverId, errorDetailsMap);
 				}
-			} else {
-				populateErrorForStock(stock, senderId, errorDetailsMap);
 			}
 		}
 	}