Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringWasteMaterialServiceImpl.java

@@ -169,11 +169,11 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         Map pe = new HashMap(); // PE材料
         pe.put("actuality", getRoundDouble(pesj.get(), 2)); // 实际
         pe.put("anticipation", zEngineeringGYVo.getPePreset()); // 预计  divide zEngineeringGYVo.getGcPreset()
-        pe.put("percentage", getRoundDouble((pesj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringGYVo.getPePreset())),2) + "%"); // 占比
+        pe.put("percentage", zEngineeringGYVo.getPePreset() == 0 ? "0.0%" : getRoundDouble((pesj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringGYVo.getPePreset())),2) + "%"); // 占比
         Map iron = new HashMap(); // 钢材
         iron.put("actuality", getRoundDouble(gsj.get(), 2)); // 实际
         iron.put("anticipation", zEngineeringGYVo.getGcPreset()); // 预计
-        iron.put("percentage", getRoundDouble((gsj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringGYVo.getGcPreset())),2) + "%"); // 占比
+        iron.put("percentage", zEngineeringGYVo.getGcPreset() == 0 ? "0.0%" : getRoundDouble((gsj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringGYVo.getGcPreset())),2) + "%"); // 占比
         zEngineeringWasteMaterialVo.setMaterialPercentagePE(pe);
         zEngineeringWasteMaterialVo.setMaterialPercentageIron(iron);
 //        zEngineeringWasteMaterialVo.setMaterialPercentagePE();
@@ -342,11 +342,11 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         Map pe = new HashMap(); // PE材料
         pe.put("actuality", getRoundDouble(pesj.get(), 2)); // 实际
         pe.put("anticipation", zEngineeringIndustryVo.getPePreset()); // 预计
-        pe.put("percentage", getRoundDouble((pesj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringIndustryVo.getPePreset())),2) + "%"); // 占比
+        pe.put("percentage", zEngineeringIndustryVo.getPePreset() == 0 ? "0.0%" : getRoundDouble((pesj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringIndustryVo.getPePreset())),2) + "%"); // 占比
         Map iron = new HashMap(); // 钢材
         iron.put("actuality", getRoundDouble(gsj.get(), 2)); // 实际
         iron.put("anticipation", zEngineeringIndustryVo.getGcPreset()); // 预计
-        iron.put("percentage", getRoundDouble((gsj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringIndustryVo.getGcPreset())),2) + "%"); // 占比
+        iron.put("percentage", zEngineeringIndustryVo.getGcPreset() == 0 ? "0.0%" : getRoundDouble((gsj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringIndustryVo.getGcPreset())),2) + "%"); // 占比
         zEngineeringWasteMaterialVo.setMaterialPercentagePE(pe);
         zEngineeringWasteMaterialVo.setMaterialPercentageIron(iron);
         return zEngineeringWasteMaterialVo;
@@ -431,11 +431,11 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
         Map pe = new HashMap(); // PE材料
         pe.put("actuality", getRoundDouble(pesj.get(), 2)); // 实际
         pe.put("anticipation", zEngineeringPipeJackingVo.getPePreset()); // 预计
-        pe.put("percentage", getRoundDouble((pesj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringPipeJackingVo.getPePreset())),2) + "%"); // 占比
+        pe.put("percentage", zEngineeringPipeJackingVo.getPePreset() == 0 ? "0.0%" : getRoundDouble((pesj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringPipeJackingVo.getPePreset())),2) + "%"); // 占比
         Map iron = new HashMap(); // 钢材
         iron.put("actuality", getRoundDouble(gsj.get(), 2)); // 实际
         iron.put("anticipation", zEngineeringPipeJackingVo.getGcPreset()); // 预计
-        iron.put("percentage", getRoundDouble((gsj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringPipeJackingVo.getGcPreset())),2) + "%"); // 占比
+        iron.put("percentage", zEngineeringPipeJackingVo.getGcPreset() == 0 ? "0.0%" : getRoundDouble((gsj.get().multiply(new BigDecimal(100))).divide(BigDecimal.valueOf(zEngineeringPipeJackingVo.getGcPreset())),2) + "%"); // 占比
         zEngineeringWasteMaterialVo.setMaterialPercentagePE(pe);
         zEngineeringWasteMaterialVo.setMaterialPercentageIron(iron);
         return zEngineeringWasteMaterialVo;