月、周产能报表导出

mes/src/main/java/com/ximai/mes/report/service/impl/DailyProductionReportServiceImp.java

@@ -189,7 +189,11 @@ public class DailyProductionReportServiceImp implements DailyProductionReportSer
             dateHashMap.put(key + "统计不合格数量", (Double)dateHashMap.get(key + "统计不合格数量") + (Double)data.get(key + "统计不合格数量"));
             dateHashMap.put(key + "统计报工数量", (Double)dateHashMap.get(key + "统计报工数量") + (Double)data.get(key + "统计报工数量"));
         }
-        dateHashMap.put(key + "统计合格率",(new BigDecimal((Double) dateHashMap.get(key + "统计合格数量")).multiply(new BigDecimal(100))).divide(new BigDecimal((Double)dateHashMap.get(key + "统计报工数量")),2, RoundingMode.HALF_UP));
+        if(((Double)dateHashMap.get(key + "统计报工数量")) > 0){
+            dateHashMap.put(key + "统计合格率",(new BigDecimal((Double) dateHashMap.get(key + "统计合格数量")).multiply(new BigDecimal(100))).divide(new BigDecimal((Double)dateHashMap.get(key + "统计报工数量")),2, RoundingMode.HALF_UP));
+        }else{
+            dateHashMap.put(key + "统计合格率",BigDecimal.ZERO);
+        }
         returnList.add(dateHashMap);
         for (String date : dateList){
             HashMap dateStatisticsHashMap = new HashMap();