Merge pull request #557 from egovernments/PFM-4518

Pfm 4518
egovernments · Sep 8, 2023 · b1aac76 · b1aac76
2 parents 3f979c7 + 7292a34
commit b1aac76
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/...ices/src/main/java/org/egov/waterconnection/repository/rowmapper/CollectionRowMapper.java b/...ices/src/main/java/org/egov/waterconnection/repository/rowmapper/CollectionRowMapper.java
@@ -35,30 +35,16 @@ public class CollectionRowMapper implements ResultSetExtractor<List<CollectionRe
 	@Override
 	public List<CollectionReportData> extractData(ResultSet rs) throws SQLException, DataAccessException {
 		List<CollectionReportData> collectionReportDataList = new ArrayList<>();
-//		CollectionReportData collectionReportData = new CollectionReportData();
-//	    Map<String, CollectionReportData> reportData = new HashMap<>();
 		while (rs.next()) {
-//			    if(reportData.get(rs.getString("connectionNo")) != null) {
-//			    	setPayments(rs, collectionReportData, reportData);
-//			    }
-//			    else {
-
 			        CollectionReportData collectionReportData = new CollectionReportData();
-//					List<BigDecimal> paymentAmounts = new ArrayList<>();
 			    	collectionReportData.setTenantName(rs.getString("tenantId"));
 			    	collectionReportData.setConnectionNo(rs.getString("connectionNo"));
 			    	collectionReportData.setOldConnectionNo(rs.getString("oldConnectionNo"));
 			    	collectionReportData.setUserId(rs.getString("uuid"));
 			    	collectionReportData.setPaymentMode(rs.getString("paymentmode"));
-//			    	paymentAmounts.add(rs.getBigDecimal("amountpaid"));
-			    	collectionReportData.setPaymentAmount(rs.getBigDecimal("amountpaid"));
-//			        collectionReportData.getPaymentAmount().add(rs.getBigDecimal("amountpaid"));
+			    	collectionReportData.setPaymentAmount(rs.getBigDecimal("totalAmountPaid"));
                     collectionReportDataList.add(collectionReportData);
-//			    }
-
 		}
-//		List<CollectionReportData> listOfValues = reportData.values().stream().collect( Collectors.toCollection(ArrayList::new));
-//		collectionReportDataList.addAll(listOfValues);
 		if(!collectionReportDataList.isEmpty()){
 			enrichConnectionHolderDetails(collectionReportDataList);
 		}