审核bug修复

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/MaterialStatisticsListVo.java

@@ -23,7 +23,7 @@ public class MaterialStatisticsListVo {
     private String enginClassification;
     @ExcelProperty(value = "工程类型")
     private String enginType;
-    @ExcelProperty(value = "节点类型")
+    @ExcelProperty(value = "工程步骤")
     private String nodeType;
     @ExcelProperty(value = "材质")
     private String materialQuality;

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

@@ -137,8 +137,11 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getAreaId()), ZEngineeringCivil::getAreaId, zEngineeringCivilBo.getAreaId());
         lqw.eq(ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
-        lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
-        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
+//        lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()),ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId())
+            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()),ZEngineeringCivil::getUnitId);
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId())
+            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),ZEngineeringCivil::getHouseId);
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, zEngineeringCivilBo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginType()), ZEngineeringCivil::getEnginType, zEngineeringCivilBo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, zEngineeringCivilBo.getEnginClassification());
@@ -237,8 +240,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
         lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-        lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
-        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()),ZEngineeringCivil::getHouseId, bo.getHouseId());
+        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()),ZEngineeringCivil::getUnitId, bo.getUnitId())
+            .isNull(!StringUtils.isNotBlank(bo.getUnitId()),ZEngineeringCivil::getUnitId);
+        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId()).isNull(!StringUtils.isNotBlank(bo.getHouseId()),ZEngineeringCivil::getHouseId);
         lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());