大屏-低空不欠债完成情况

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxLowaltitudeDebtfreeCheckServiceImpl.java

@@ -348,7 +348,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
             //获取完成情况
             String completionstatus = getCompletionstatus(item);
 
-            final String[] split = completionstatus.split("//");
+            final String[] split = completionstatus.split("/");
             valueObj.put("numerator", valueObj.getBigDecimal("numerator").add(new BigDecimal(split[0])));
             valueObj.put("denominator", valueObj.getBigDecimal("denominator").add(new BigDecimal(split[1])));
 
@@ -377,14 +377,12 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
             indicator.setCompleted(row.getInteger("numerator"));
             indicator.setTotal(row.getInteger("denominator"));
 
-            if(ObjectUtil.isNull(row.getInteger("denominator"))) { //分母为空，完成率为0
+            final BigDecimal denominator = row.getBigDecimal("denominator");
+            if(ObjectUtil.isNull(denominator) || BigDecimal.ZERO.equals(denominator)) { //分母为空，完成率为0
                 indicator.setCompletionrate(BigDecimal.ZERO);
             } else {
-                BigDecimal completionRate = row.getBigDecimal("numerator")
-                        .divide(row.getBigDecimal("denominator"))
-                        .multiply(new BigDecimal("100"))
-                        .setScale(2, RoundingMode.DOWN);
-                indicator.setCompletionrate(completionRate);
+                Float f = row.getFloat("numerator") / row.getFloat("denominator") * 100;
+                indicator.setCompletionrate(new BigDecimal(String.format("%.2f", f)));
             }
             list.add(indicator);
         }