materialQuality == null

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

@@ -147,16 +147,21 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
                 lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
                 List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
                 material.stream().forEach(item4->{
-                    String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
-                    if("0".equals(type)){
-                        pesj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))) );
+                    String materialQuality = item4.getMaterialQuality();
+                    if(materialQuality == null){
+//                        continue;
+                    }else {
+                        String type = zEnginMaterialQualityMapper.selectVoById(materialQuality).getMaterialType();
+                        if("0".equals(type)){
+                            pesj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))) );
 
-//                        pesj = pesj.get().add(new BigDecimal(Double.toString(item4.getNumber())));
-                    }else if("1".equals(type)){
-//                        gsj.updateAndGet(v -> new BigDecimal(Double.toString(item4.getNumber())));
-                        gsj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))) );
+    //                        pesj = pesj.get().add(new BigDecimal(Double.toString(item4.getNumber())));
+                        }else if("1".equals(type)){
+    //                        gsj.updateAndGet(v -> new BigDecimal(Double.toString(item4.getNumber())));
+                            gsj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))) );
 
-//                        gsj.updateAndGet(v -> v + new BigDecimal(Double.toString(item4.getNumber())).doubleValue());
+    //                        gsj.updateAndGet(v -> v + new BigDecimal(Double.toString(item4.getNumber())).doubleValue());
+                        }
                     }
                 });
             }
@@ -320,11 +325,16 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
                 lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
                 List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
                 material.stream().forEach(item4->{
-                    String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
-                    if("0".equals(type)){
-                        pesj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))));
-                    }else if("1".equals(type)){
-                        gsj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))));
+                    String materialQuality = item4.getMaterialQuality();
+                    if(materialQuality == null){
+//                        continue;
+                    }else {
+                        String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
+                        if("0".equals(type)){
+                            pesj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))));
+                        }else if("1".equals(type)){
+                            gsj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))));
+                        }
                     }
                 });
             }
@@ -404,11 +414,16 @@ public class ZEngineeringWasteMaterialServiceImpl implements IZEngineeringWasteM
                 lqw4.eq(StringUtils.isNotBlank(info.getId()), ZEngineeringMaterial::getDetailsId, info.getId());
                 List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
                 material.stream().forEach(item4->{
-                    String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
-                    if("0".equals(type)){
-                        pesj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))));
-                    }else if("1".equals(type)){
-                        gsj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))));
+                    String materialQuality = item4.getMaterialQuality();
+                    if(materialQuality == null){
+//                        continue;
+                    }else {
+                        String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
+                        if("0".equals(type)){
+                            pesj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))));
+                        }else if("1".equals(type)){
+                            gsj.updateAndGet(v ->v.add(new BigDecimal(Double.toString(item4.getNumber()))));
+                        }
                     }
                 });
             }