From c3ddbfdab39ac16357663297a9c1c6d6b23a2d80 Mon Sep 17 00:00:00 2001 From: deepikaarora88 Date: Thu, 21 Mar 2024 08:41:45 +0000 Subject: [PATCH 1/2] P1 formula round off --- .../org/egov/bpa/calculator/services/CalculationService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/municipal-services/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java b/municipal-services/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java index 457777f1c14..c10ff5c83a2 100644 --- a/municipal-services/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java +++ b/municipal-services/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java @@ -1,11 +1,13 @@ package org.egov.bpa.calculator.services; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; + import org.egov.bpa.calculator.config.BPACalculatorConfig; import org.egov.bpa.calculator.kafka.broker.BPACalculatorProducer; import org.egov.bpa.calculator.utils.BPACalculatorConstants; @@ -169,7 +171,7 @@ else if (calulationCriteria.getFeeType().equalsIgnoreCase(BPACalculatorConstants BigDecimal area=new BigDecimal(node.get("area")); totalTax=boundayWallLength.multiply(BigDecimal.valueOf(2.5)).add(area.multiply(BigDecimal.valueOf(9)).multiply(BigDecimal.valueOf(2.5))); - estimate.setEstimateAmount(totalTax.abs()); + estimate.setEstimateAmount(totalTax.setScale(0, RoundingMode.HALF_UP)); estimate.setCategory(Category.FEE); String taxHeadCode = utils.getTaxHeadCode(calulationCriteria.getBpa().getBusinessService(), calulationCriteria.getFeeType()); From 1da5a125454cf5314c819a58bb7ec640eb562af7 Mon Sep 17 00:00:00 2001 From: deepikaarora88 Date: Thu, 21 Mar 2024 08:43:21 +0000 Subject: [PATCH 2/2] P1 formula round off --- .../org/egov/bpa/calculator/services/CalculationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java b/municipal-services/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java index c10ff5c83a2..5c1c0e92833 100644 --- a/municipal-services/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java +++ b/municipal-services/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java @@ -170,7 +170,7 @@ else if (calulationCriteria.getFeeType().equalsIgnoreCase(BPACalculatorConstants BigDecimal boundayWallLength=new BigDecimal(node.get("boundaryWallLength")); BigDecimal area=new BigDecimal(node.get("area")); - totalTax=boundayWallLength.multiply(BigDecimal.valueOf(2.5)).add(area.multiply(BigDecimal.valueOf(9)).multiply(BigDecimal.valueOf(2.5))); + totalTax=boundayWallLength.multiply(BigDecimal.valueOf(2.5)).add(area.multiply(BigDecimal.valueOf(2.5))); estimate.setEstimateAmount(totalTax.setScale(0, RoundingMode.HALF_UP)); estimate.setCategory(Category.FEE);