Переглянути джерело

修复首页统计接口除0bug

liuyaowen 10 місяців тому
батько
коміт
031a32e878

+ 5 - 1
src/main/java/com/yunfeiyun/agmp/fms/controller/FmsConsoleController.java

@@ -383,6 +383,10 @@ public class FmsConsoleController extends BaseController {
         // 计算未使用的地块数量
         fmsConsoleStatResVo.setBlockUnUsedNum(fmsConsoleStatResVo.getBlockTotalNum().subtract(fmsConsoleStatResVo.getBlockUsedNum()));
         // 计算地块使用率
-        fmsConsoleStatResVo.setBlockUsageRate(planArea.divide(fmsConsoleStatResVo.getBlockTotalArea(),2, RoundingMode.HALF_UP).doubleValue());
+        if(fmsConsoleStatResVo.getBlockTotalArea().compareTo(new BigDecimal("0"))==0){
+            fmsConsoleStatResVo.setBlockUsageRate(0.00);
+        }else {
+            fmsConsoleStatResVo.setBlockUsageRate(planArea.divide(fmsConsoleStatResVo.getBlockTotalArea(),2, RoundingMode.HALF_UP).doubleValue());
+        }
     }
 }

+ 1 - 1
src/main/resources/mapper/FmsPlanMapper.xml

@@ -527,7 +527,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         c.cropName,
         c.cropType,
         c.cropMaintype,
-        c.tid,
+        c.tid
         from
         FmsPlan p
         LEFT JOIN