diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
index db9039b1..3b4c8f8d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java
@@ -52,11 +52,11 @@ public class CommonUtil {
         if (CollectionUtils.isEmpty(list) || StringUtils.isEmpty(maType)) {
             return 0;
         }
-        BigDecimal value = new BigDecimal(new Double(0).toString());
+        BigDecimal value = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             Map<String, String> map = list.get(i);
             String num = Objects.isNull(map.get("num")) ? "0" : String.valueOf(map.get("num"));
-            BigDecimal value2 = new BigDecimal(new Double(num));
+            BigDecimal value2 = new BigDecimal(num);
             value = value.add(value2);
         }
         double doubleValue = value.doubleValue();
@@ -78,16 +78,16 @@ public class CommonUtil {
             valueList.add(0);
             return valueList;
         }
-        BigDecimal numberValue = new BigDecimal(new Double(0).toString());
-        BigDecimal countValue = new BigDecimal(new Double(0).toString());
+        BigDecimal numberValue = new BigDecimal("0");
+        BigDecimal countValue = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             if (Objects.nonNull(list.get(i).getNum()) && Objects.equals("0", list.get(i).getManageType())) {
                 // 编号
-                BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
+                BigDecimal value = BigDecimal.valueOf(list.get(i).getNum());
                 numberValue = numberValue.add(value);
             } else if (Objects.nonNull(list.get(i).getNum()) && Objects.equals("1", list.get(i).getManageType())) {
                 // 计数
-                BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
+                BigDecimal value = BigDecimal.valueOf(list.get(i).getNum());
                 countValue = countValue.add(value);
             }
         }
@@ -112,17 +112,17 @@ public class CommonUtil {
             valueList.add(0);
             return valueList;
         }
-        BigDecimal jjValue = new BigDecimal(new Double(0).toString());
-        BigDecimal tsValue = new BigDecimal(new Double(0).toString());
+        BigDecimal jjValue = new BigDecimal("0");
+        BigDecimal tsValue = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             if (Objects.isNull(list.get(i))) {
                 continue;
             }
             if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.JJ)) {
-                BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
+                BigDecimal value = BigDecimal.valueOf(list.get(i).getNum());
                 jjValue = jjValue.add(value);
             } else if (Objects.equals(list.get(i).getCompanyName(), CommonConstants.TS)) {
-                BigDecimal value = new BigDecimal(new Double(list.get(i).getNum()).toString());
+                BigDecimal value = BigDecimal.valueOf(list.get(i).getNum());
                 tsValue = tsValue.add(value);
             }
         }
@@ -147,17 +147,15 @@ public class CommonUtil {
         List<String> nameList = new ArrayList<>();
         List<Integer> valueList = new ArrayList<>();
         List<Integer> valueList2 = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(lyList)) {
-            for (int i = 0; i < lyList.size(); i++) {
-                MaterialDataVo vo = lyList.get(i);
-                if (Objects.nonNull(vo.getUnitName())) {
-                    nameList.add(vo.getUnitName());
-                    valueList.add((int) Math.round(vo.getNum()));
-                    for (int j = 0; j < bfList.size(); j++) {
-                        MaterialDataVo vo2 = bfList.get(j);
-                        if (Objects.nonNull(vo2.getUnitName()) && Objects.equals(vo.getUnitName(), vo2.getUnitName())) {
-                            valueList2.add((int) Math.round(vo2.getNum()));
-                        }
+        for (int i = 0; i < lyList.size(); i++) {
+            MaterialDataVo vo = lyList.get(i);
+            if (Objects.nonNull(vo.getUnitName())) {
+                nameList.add(vo.getUnitName());
+                valueList.add((int) Math.round(vo.getNum()));
+                for (int j = 0; j < bfList.size(); j++) {
+                    MaterialDataVo vo2 = bfList.get(j);
+                    if (Objects.nonNull(vo2.getUnitName()) && Objects.equals(vo.getUnitName(), vo2.getUnitName())) {
+                        valueList2.add((int) Math.round(vo2.getNum()));
                     }
                 }
             }
@@ -182,12 +180,12 @@ public class CommonUtil {
             valueList.add(0);
             return valueList;
         }
-        BigDecimal planValue = new BigDecimal(new Double(0).toString());
-        BigDecimal realityValue = new BigDecimal(new Double(0).toString());
+        BigDecimal planValue = new BigDecimal("0");
+        BigDecimal realityValue = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
-            BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getPlanNum())));
-            BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRealityNum())));
+            BigDecimal value = BigDecimal.valueOf(vo.getPlanNum());
+            BigDecimal value2 = BigDecimal.valueOf(vo.getRealityNum());
             planValue = planValue.add(value);
             realityValue = realityValue.add(value2);
         }
@@ -214,15 +212,15 @@ public class CommonUtil {
             return valueList;
         }
         /*维修总量/维修合格数量/维修报废数量/待维修数量*/
-        BigDecimal repairValue = new BigDecimal(new Double(0).toString());
-        BigDecimal repairedValue = new BigDecimal(new Double(0).toString());
-        BigDecimal scrapValue = new BigDecimal(new Double(0).toString());
-        BigDecimal waitRepairedValue = new BigDecimal(new Double(0).toString());
+        BigDecimal repairValue = new BigDecimal("0");
+        BigDecimal repairedValue = new BigDecimal("0");
+        BigDecimal scrapValue = new BigDecimal("0");
+        BigDecimal waitRepairedValue = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
-            BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getRepairNum())));
-            BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRepairedNum())));
-            BigDecimal value3 = new BigDecimal(new Double(String.valueOf(vo.getScrapNum())));
+            BigDecimal value = BigDecimal.valueOf(vo.getRepairNum());
+            BigDecimal value2 = BigDecimal.valueOf(vo.getRepairedNum());
+            BigDecimal value3 = BigDecimal.valueOf(vo.getScrapNum());
             repairValue = repairValue.add(value);
             repairedValue = repairedValue.add(value2);
             scrapValue = scrapValue.add(value3);
@@ -251,10 +249,10 @@ public class CommonUtil {
         if (CollectionUtils.isEmpty(list)) {
             return 0;
         }
-        BigDecimal totalValue = new BigDecimal(new Double(0).toString());
+        BigDecimal totalValue = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
-            BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
+            BigDecimal value = BigDecimal.valueOf(vo.getNum());
             totalValue = totalValue.add(value);
         }
         double doubleTotalValue = totalValue.doubleValue();
@@ -272,14 +270,14 @@ public class CommonUtil {
         if (CollectionUtils.isEmpty(list)) {
             return 0;
         }
-        BigDecimal finalValue = new BigDecimal(new Double(0).toString());
-        BigDecimal totalValue = new BigDecimal(new Double(0).toString());
-        BigDecimal totalValue2 = new BigDecimal(new Double(0).toString());
+        BigDecimal finalValue = new BigDecimal("0");
+        BigDecimal totalValue = new BigDecimal("0");
+        BigDecimal totalValue2 = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
-            BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
+            BigDecimal value = BigDecimal.valueOf(vo.getNum());
             totalValue = totalValue.add(value);
-            BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum2())));
+            BigDecimal value2 = BigDecimal.valueOf(vo.getNum2());
             totalValue2 = totalValue2.add(value2);
         }
         finalValue = totalValue.subtract(totalValue2);
@@ -298,16 +296,16 @@ public class CommonUtil {
         if (CollectionUtils.isEmpty(list)) {
             return 0;
         }
-        BigDecimal finalValue = new BigDecimal(new Double(0).toString());
-        BigDecimal totalValue = new BigDecimal(new Double(0).toString());
-        BigDecimal totalValue2 = new BigDecimal(new Double(0).toString());
+        BigDecimal finalValue = new BigDecimal("0");
+        BigDecimal totalValue = new BigDecimal("0");
+        BigDecimal totalValue2 = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
             if (Objects.equals("1", vo.getType())) {
-                BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
+                BigDecimal value = BigDecimal.valueOf(vo.getNum());
                 totalValue = totalValue.add(value);
             } else if (Objects.equals("2", vo.getType())) {
-                BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum())));
+                BigDecimal value2 = BigDecimal.valueOf(vo.getNum());
                 totalValue2 = totalValue2.add(value2);
             }
         }
@@ -328,15 +326,15 @@ public class CommonUtil {
             return 0;
         }
         /*维修总量/维修合格数量/维修报废数量/待维修数量*/
-        BigDecimal repairValue = new BigDecimal(new Double(0).toString());
-        BigDecimal repairedValue = new BigDecimal(new Double(0).toString());
-        BigDecimal scrapValue = new BigDecimal(new Double(0).toString());
-        BigDecimal waitRepairedValue = new BigDecimal(new Double(0).toString());
+        BigDecimal repairValue = new BigDecimal("0");
+        BigDecimal repairedValue = new BigDecimal("0");
+        BigDecimal scrapValue = new BigDecimal("0");
+        BigDecimal waitRepairedValue = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
-            BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getRepairNum())));
-            BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getRepairedNum())));
-            BigDecimal value3 = new BigDecimal(new Double(String.valueOf(vo.getScrapNum())));
+            BigDecimal value = BigDecimal.valueOf(vo.getRepairNum());
+            BigDecimal value2 = BigDecimal.valueOf(vo.getRepairedNum());
+            BigDecimal value3 = BigDecimal.valueOf(vo.getScrapNum());
             repairValue = repairValue.add(value);
             repairedValue = repairedValue.add(value2);
             scrapValue = scrapValue.add(value3);
@@ -357,10 +355,10 @@ public class CommonUtil {
         if (CollectionUtils.isEmpty(list)){
             return 0;
         }
-        BigDecimal totalValue = new BigDecimal(new Double(0).toString());
+        BigDecimal totalValue = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
-            BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
+            BigDecimal value = BigDecimal.valueOf(vo.getNum());
             totalValue = totalValue.add(value);
         }
         double doubleTotalValue = totalValue.doubleValue();
@@ -376,14 +374,14 @@ public class CommonUtil {
         if (CollectionUtils.isEmpty(list)){
             return 0;
         }
-        BigDecimal finalValue = new BigDecimal(new Double(0).toString());
-        BigDecimal totalValue = new BigDecimal(new Double(0).toString());
-        BigDecimal totalValue2 = new BigDecimal(new Double(0).toString());
+        BigDecimal finalValue = new BigDecimal("0");
+        BigDecimal totalValue = new BigDecimal("0");
+        BigDecimal totalValue2 = new BigDecimal("0");
         for (int i = 0; i < list.size(); i++) {
             ScrapAnalysisVo vo = list.get(i);
-            BigDecimal value = new BigDecimal(new Double(String.valueOf(vo.getNum())));
+            BigDecimal value = BigDecimal.valueOf(vo.getNum());
             totalValue = totalValue.add(value);
-            BigDecimal value2 = new BigDecimal(new Double(String.valueOf(vo.getNum2())));
+            BigDecimal value2 = BigDecimal.valueOf(vo.getNum2());
             totalValue2 = totalValue2.add(value2);
         }
         finalValue = totalValue.subtract(totalValue2);