ISTE-229

egovernments · Aug 9, 2024 · 587b476 · 587b476
1 parent 9f9cf75
commit 587b476
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/...es/src/main/java/org/egov/waterconnection/repository/rowmapper/LedgerReportRowMapper.java b/...es/src/main/java/org/egov/waterconnection/repository/rowmapper/LedgerReportRowMapper.java
@@ -192,6 +192,8 @@ private void addPaymentToLedger(List<Map<String, Object>> monthlyRecordList) {
             boolean paymentMatched = false;
             if(payments!=null)
             {
+                BigDecimal totalPaymentInMonth=BigDecimal.ZERO;
+                BigDecimal totalBalanceLeftInMonth=BigDecimal.ZERO;
                 for (Payment payment : payments) {
                     Long transactionDateLong = payment.getTransactionDate();
                     LocalDate transactionDate = Instant.ofEpochMilli(transactionDateLong).atZone(ZoneId.systemDefault()).toLocalDate();
@@ -201,22 +203,18 @@ private void addPaymentToLedger(List<Map<String, Object>> monthlyRecordList) {
                         paymentLedgerReport.setCollectionDate(transactionDateLong);
                         paymentLedgerReport.setReceiptNo(payment.getPaymentDetails().get(0).getReceiptNumber());
                         paymentLedgerReport.setPaid(payment.getTotalAmountPaid());
-//                        BigDecimal totalDueAmount=payment.getTotalDue();
-//                        if(totalDueAmount.equals(BigDecimal.ZERO))
-//                        {
-                            paymentLedgerReport.setBalanceLeft(payment.getTotalDue().subtract(paymentLedgerReport.getPaid()));
-//                        }
-//                        else
-//                        {
-//                            paymentLedgerReport.setBalanceLeft(totalDueAmount.subtract(paymentLedgerReport.getPaid()));
-//                        }
+                        paymentLedgerReport.setBalanceLeft(payment.getTotalDue().subtract(paymentLedgerReport.getPaid()));
+                        totalPaymentInMonth=totalPaymentInMonth.add(payment.getTotalAmountPaid());
+                        totalBalanceLeftInMonth=totalBalanceLeftInMonth.add(payment.getTotalDue());
                         if (ledgerReport.getPayment() == null) {
                             ledgerReport.setPayment(new ArrayList<>());
                         }
                         ledgerReport.getPayment().add(paymentLedgerReport);
                         paymentMatched = true;
                     }
                 }
+                ledgerReport.setTotalBalanceLeftInMonth(totalPaymentInMonth);
+                ledgerReport.setTotalPaymentInMonth(totalPaymentInMonth);
             }
             if (!paymentMatched) {
                 PaymentLedgerReport defaultPaymentLedgerReport = new PaymentLedgerReport();

diff --git a/...-services/ws-services/src/main/java/org/egov/waterconnection/web/models/LedgerReport.java b/...-services/ws-services/src/main/java/org/egov/waterconnection/web/models/LedgerReport.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,4 +18,10 @@ public class LedgerReport
 
     @JsonProperty("payment")
     private List<PaymentLedgerReport> payment=new ArrayList<>();
+
+    @JsonProperty("totalPaymentInMonth")
+    private BigDecimal totalPaymentInMonth=BigDecimal.ZERO;
+
+    @JsonProperty("totalBalanceLeftInMonth")
+    private BigDecimal totalBalanceLeftInMonth=BigDecimal.ZERO;
 }