周月报

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/WeekMonthDataAdaptor.java

@@ -163,7 +163,7 @@ public class WeekMonthDataAdaptor {
         if (jsonObject == null) {
             return null;
         }
-        BigDecimal useMatlNum = jsonObject.getBigDecimal("useMatlNum");
+        BigDecimal useMatlNum = Optional.ofNullable(jsonObject.getBigDecimal("useMatlNum")).orElse(BigDecimal.ZERO);
         BigDecimal convSalesAmt = Optional.ofNullable(jsonObject.getBigDecimal("omniConvSalesAmt")).orElse(BigDecimal.ZERO);
         return formatDecimal(useMatlNum,convSalesAmt);
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/WeekMonthReportBuilder.java

@@ -143,7 +143,10 @@ public class WeekMonthReportBuilder {
             return;
         }
         // 生成图片地址
-        String url = DrawImageUtils.drawImage(context.getFactoryCode(), materialDataResult.getFirstValue(), materialDataResult.getSecondValue(), templatePath);
+        String url = DrawImageUtils.drawImage(context.getFactoryCode(),
+                StringUtils.isBlank(materialDataResult.getFirstValue())?"0":materialDataResult.getFirstValue(),
+                StringUtils.isBlank(materialDataResult.getSecondValue())?"0":materialDataResult.getSecondValue(),
+                templatePath);
         context.setMaterialReportUrl(url);
     }