feature：周报月报金额

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

@@ -114,7 +114,7 @@ public class MaterialDataAdaptor {
             return null;
         }
         int useMatlNum = jsonObject.getIntValue("useMatlNum");
-        BigDecimal convSalesAmt = Optional.ofNullable(jsonObject.getBigDecimal("convSalesAmt")).orElse(BigDecimal.ZERO);
+        BigDecimal convSalesAmt = Optional.ofNullable(jsonObject.getBigDecimal("omniConvSalesAmt")).orElse(BigDecimal.ZERO);
         String amountUnit = "";
         if (convSalesAmt.compareTo(new BigDecimal(10000)) >= 0) {
             convSalesAmt = convSalesAmt.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);
@@ -164,6 +164,7 @@ public class MaterialDataAdaptor {
         }
         BigDecimal dayAvgUseMatlNum = jsonObject.getBigDecimal("dayAvgUseMatlNum");
         BigDecimal convSalesAmt = Optional.ofNullable(jsonObject.getBigDecimal("convSalesAmt")).orElse(BigDecimal.ZERO);
+        convSalesAmt = convSalesAmt.add(Optional.ofNullable(jsonObject.getBigDecimal("offlineConvSalesAmt")).orElse(BigDecimal.ZERO));
         String amountUnit = "";
         if (convSalesAmt.compareTo(new BigDecimal(10000)) >= 0) {
             convSalesAmt = convSalesAmt.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);