Merge pull request #1057 from deepikaarora88/Dev-2.0

calculation fix and noc bypass
upyog · Apr 12, 2024 · 39b320a · 39b320a
2 parents 32e145c + ceda51e
commit 39b320a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...ces/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java b/...ces/bpa-calculator/src/main/java/org/egov/bpa/calculator/services/CalculationService.java
@@ -168,9 +168,9 @@ else if (calulationCriteria.getFeeType().equalsIgnoreCase(BPACalculatorConstants
 				throw new CustomException(BPACalculatorConstants.PARSING_ERROR, "builtUpArea should not be null!!");
 
 		BigDecimal boundayWallLength=new BigDecimal(node.get("boundaryWallLength"));
-		BigDecimal area=new BigDecimal(node.get("builtUpArea"));
+		BigDecimal area=new BigDecimal(node.get("builtUpArea")).multiply(BigDecimal.valueOf(10.7639));
 
-		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);
 

diff --git a/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/BPAService.java b/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/BPAService.java
@@ -133,7 +133,7 @@ public BPA create(BPARequest bpaRequest) {
 		}
 		enrichmentService.enrichBPACreateRequest(bpaRequest, mdmsData, values);
 		wfIntegrator.callWorkFlow(bpaRequest);
-		nocService.createNocRequest(bpaRequest, mdmsData);
+		//nocService.createNocRequest(bpaRequest, mdmsData);
 		this.addCalculation(applicationType, bpaRequest);
 		repository.save(bpaRequest);
 		return bpaRequest.getBPA();

diff --git a/municipal-services/bpa-services/src/main/java/org/egov/bpa/validator/BPAValidator.java b/municipal-services/bpa-services/src/main/java/org/egov/bpa/validator/BPAValidator.java
@@ -631,7 +631,8 @@ public void validateApplication(BPARequest bpaRequest)
 		if(b &&  obj.get("usage").toString().equalsIgnoreCase("Residential"))
 		{
 			BigDecimal height=new BigDecimal(obj.get("height").toString());
-			BigDecimal area=new BigDecimal(obj.get("area").toString());
+			//convert area to sq yard for validation
+			BigDecimal area=new BigDecimal(obj.get("area").toString()).multiply(BigDecimal.valueOf(1.19599));
 			if(height.intValue()>15)
 				throw new CustomException(null,"Height should not be more than 15 metres");