修改下管庭院

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

@@ -116,7 +116,7 @@ public class ZEngineeringGYServiceImpl implements IZEngineeringGYService {
         zEngineeringIndustryVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
         ArrayList<ZEngineeringGYVo> list = new ArrayList<>();
         list.add(zEngineeringIndustryVo);
-        zEngineeringIndustryVo.setNodeReViewStateList(nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
+        zEngineeringIndustryVo.setNodeReViewStateList(list==null?Collections.EMPTY_LIST:nodeService.ReViewGYList(list)!=null?nodeService.ReViewGYList(list).get(zEngineeringIndustryVo.getId()):Collections.EMPTY_LIST);
         return queryById(id);
     }
 

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

@@ -828,11 +828,17 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                         lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
                         List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
                         material.stream().forEach(item4->{
-                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
-                            if("0".equals(type)){
-                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                            }else if("1".equals(type)){
-                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            String materialQualityId = item4.getMaterialQuality();
+                            if(materialQualityId != null){
+                                ZEnginMaterialQualityVo zEnginMaterialQualityVo = zEnginMaterialQualityMapper.selectVoById(materialQualityId);
+                                if(zEnginMaterialQualityVo != null){
+                                    String type = zEnginMaterialQualityVo.getMaterialType();
+                                    if("0".equals(type)){
+                                        item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                                    }else if("1".equals(type)){
+                                        item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                                    }
+                                }
                             }
                         });
                     });
@@ -901,11 +907,17 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                         lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
                         List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
                         material.stream().forEach(item4->{
-                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
-                            if("0".equals(type)){
-                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                            }else if("1".equals(type)){
-                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            String materialQualityId = item4.getMaterialQuality();
+                            if(materialQualityId != null){
+                                ZEnginMaterialQualityVo zEnginMaterialQualityVo = zEnginMaterialQualityMapper.selectVoById(materialQualityId);
+                                if(zEnginMaterialQualityVo != null){
+                                    String type = zEnginMaterialQualityVo.getMaterialType();
+                                    if("0".equals(type)){
+                                        item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                                    }else if("1".equals(type)){
+                                        item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                                    }
+                                }
                             }
                         });
                     });
@@ -971,11 +983,17 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                         lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
                         List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
                         material.stream().forEach(item4->{
-                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
-                            if("0".equals(type)){
-                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                            }else if("1".equals(type)){
-                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            String materialQualityId = item4.getMaterialQuality();
+                            if (materialQualityId != null){
+                                ZEnginMaterialQualityVo zEnginMaterialQualityVo = zEnginMaterialQualityMapper.selectVoById(materialQualityId);
+                                if(zEnginMaterialQualityVo != null){
+                                    String type = zEnginMaterialQualityVo.getMaterialType();
+                                    if("0".equals(type)){
+                                        item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                                    }else if("1".equals(type)){
+                                        item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                                    }
+                                }
                             }
                         });
                     });
@@ -988,11 +1006,17 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                         lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
                         List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
                         material.stream().forEach(item4->{
-                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
-                            if("0".equals(type)){
-                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
-                            }else if("1".equals(type)){
-                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            String materialQualityId = item4.getMaterialQuality();
+                            if(materialQualityId != null){
+                                ZEnginMaterialQualityVo zEnginMaterialQualityVo = zEnginMaterialQualityMapper.selectVoById(materialQualityId);
+                                if(zEnginMaterialQualityVo != null){
+                                    String type = zEnginMaterialQualityVo.getMaterialType();
+                                    if("0".equals(type)){
+                                        item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                                    }else if("1".equals(type)){
+                                        item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                                    }
+                                }
                             }
                         });
                     });