添加审核删除施工信息功能

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

@@ -633,16 +633,19 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
         if (StringUtils.isEmpty(bo.getBuildingId())) {
+            add.setBuildingId(null);
             lqw.isNull(ZEngineeringCivil::getBuildingId);
         } else {
             lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
         }
         if (StringUtils.isEmpty(bo.getUnitId())) {
+            add.setUnitId(null);
             lqw.isNull(ZEngineeringCivil::getUnitId);
         } else {
             lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
         }
         if (StringUtils.isEmpty(bo.getHouseId())) {
+            add.setHouseId(null);
             lqw.isNull(ZEngineeringCivil::getHouseId);
         } else {
             lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
@@ -656,6 +659,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 izMaterialStatisticsService.insert(bo);
         }
         if (ObjectUtils.isEmpty(zEngineeringCivilVo)) {
+
             boolean flag = baseMapper.insert(add) > 0;
             if (flag) {
                 bo.setId(add.getId());
@@ -967,7 +971,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             izEngineeringInfoService.deleteByIdNoDelFiles(zEngineeringInfoBo);
         });
         infoIdList.getInfoIdList().stream().forEach(item -> {
-            item.setState("1");
+            item.setState(zEngineeringReviewBo.getReviewStatus());
             izEngineeringInfoService.update(item);
         });
         ZEngineeringCivil zEngineeringCivil = baseMapper.selectById(zEngineeringNode.getCivliId());

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

@@ -702,7 +702,7 @@ public class ZEngineeringInfoServiceImpl implements IZEngineeringInfoService {
             //lqwstatis.eq(StringUtils.isNotBlank(zEngineeringNode.getType()), ZMaterialStatistics::getNodeType, zEngineeringNode.getType());
             ZMaterialStatistics zMaterialStatistics = zMaterialStatisticsMapper.selectOne(lqwstatis);
             if (!ObjectUtils.isEmpty(zMaterialStatistics)) {
-                zMaterialStatistics.setRealitySize(BigDecimal.valueOf(zMaterialStatistics.getRealitySize()).subtract(BigDecimal.valueOf(item.getNumber())).doubleValue());
+                zMaterialStatistics.setRealitySize(BigDecimal.valueOf(zMaterialStatistics.getRealitySize()).subtract(BigDecimal.valueOf(item.getNumber()==null?0:item.getNumber())).doubleValue());
                 zMaterialStatisticsMapper.updateById(zMaterialStatistics);
             }
         });