批量审核

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

@@ -181,7 +181,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
         ZEngineeringCivilVo zEngineeringCivilVo = baseMapper.selectVoOne(lqw);
         if ("indoor_engin".equals(bo.getEnginClassification())) {
-            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) && !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) && bo.getzEngineeringNodeBoList().size() > 0)
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo()) || !ObjectUtils.isEmpty(bo.getzEngineeringNodeBoList()) || bo.getzEngineeringNodeBoList().size() > 0)
                 izMaterialStatisticsService.insert(bo);
         }
         if (ObjectUtils.isEmpty(zEngineeringCivilVo)) {

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

@@ -102,9 +102,10 @@ public class ZMaterialStatisticsServiceImpl implements IZMaterialStatisticsServi
     @Async("threadPoolTaskExecutor")
     public Boolean insert(ZEngineeringCivilBo bo) {
 //      List<ZEngineeringMaterialBo> zMaterialStatisticsList= izEngineeringInfoService.getzEngineeringMaterialBoList(bo);
-        if (bo.getzEngineeringNodeBo().getzEngineeringInfoBo().getzEngineeringMaterialBo().size()>0)
+        bo.getzEngineeringNodeBoList().stream().forEach(item2->{
+        if (item2.getzEngineeringInfoBo().getzEngineeringMaterialBo().size()>0)
         {
-            bo.getzEngineeringNodeBo().getzEngineeringInfoBo().getzEngineeringMaterialBo().stream().forEach(item->{
+            item2.getzEngineeringInfoBo().getzEngineeringMaterialBo().stream().forEach(item->{
                 LambdaQueryWrapper<ZMaterialStatistics> lqw = Wrappers.lambdaQuery();
                 lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZMaterialStatistics::getAreaId, bo.getAreaId());
                 lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZMaterialStatistics::getBuildingId, bo.getBuildingId());
@@ -130,6 +131,7 @@ public class ZMaterialStatisticsServiceImpl implements IZMaterialStatisticsServi
 
             });
         }
+        });
         return null;
     }