pdf related changes

misdwss · Apr 25, 2023 · 58a6185 · 58a6185
1 parent 5ed4f92
commit 58a6185
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java b/business-services/billing-service/src/main/java/org/egov/demand/service/DemandService.java
@@ -530,6 +530,7 @@ public DemandHistory getDemandHistory(@Valid DemandCriteria demandCriteria, Requ
 		List<Demand> demandList = getDemands(demandCriteria, requestInfo);
 		demands = demandRepository.getDemandHistory(demandCriteria);
 		List<Demand> demList = demandList.stream().filter(i->(!i.getIsPaymentCompleted().booleanValue())).collect(Collectors.toList());
+		List<Demand> paymentCompletedDemandList = demandList.stream().filter(i->(i.getIsPaymentCompleted().booleanValue())).collect(Collectors.toList());
 
 		BigDecimal advanceAdjustedAmount = BigDecimal.ZERO;
 		BigDecimal waterCharge = demList.get(demList.size() - 1).getDemandDetails().get(0).getTaxAmount();
@@ -540,7 +541,7 @@ public DemandHistory getDemandHistory(@Valid DemandCriteria demandCriteria, Requ
 					}
 				}
 		}
-		if(advanceAdjustedAmount.compareTo(BigDecimal.ZERO) == 0) {
+		if(paymentCompletedDemandList.size()>0) {
 		 waterCharge = demList.get(demList.size() - 1).getDemandDetails().get(0).getTaxAmount().
 				 subtract(demList.get(demList.size() - 1).getDemandDetails().get(0).getCollectionAmount());
 		}