App总览-生产数据-本月本年近一年

sms_water/src/main/java/com/huaxu/controller/AppPageReportController.java

@@ -103,18 +103,15 @@ public class AppPageReportController {
      * @return
      */
     private BigDecimal CalculationNrw( List<DeviceWaterSupply> makingWaterList,List<DeviceWaterSupply> sellerWaterList){
-        BigDecimal makingWaterAmount = new BigDecimal("0");
-        BigDecimal sellerWaterAmount = new BigDecimal("0");
+        BigDecimal makingWaterAmount = new BigDecimal(0);
+        BigDecimal sellerWaterAmount = new BigDecimal(0);
         for(DeviceWaterSupply water : makingWaterList){
-            makingWaterAmount.add(water.getAmount());
+            makingWaterAmount = makingWaterAmount.add(water.getAmount());
         }
-
         for(DeviceWaterSupply water : sellerWaterList){
-            sellerWaterAmount.add(water.getAmount());
+            sellerWaterAmount = sellerWaterAmount.add(water.getAmount());
         }
-
-        BigDecimal nrw = makingWaterAmount.subtract(sellerWaterAmount).multiply(new BigDecimal("100")).divide(makingWaterAmount,2);
-
+        BigDecimal nrw = makingWaterAmount ==BigDecimal.ZERO ? BigDecimal.ZERO : makingWaterAmount.subtract(sellerWaterAmount).multiply(new BigDecimal(100)).divide(makingWaterAmount,2);
         return nrw;
     }
 }