diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index ed8b1b7b85..cdf6227a8e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -208,14 +208,16 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setChildren(new ArrayList<>()); //当前楼栋共有多少户,有多少户有人住 buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); - // 总单元数 + /* // 总单元数 Integer totalUnitNum = null == item.getTotalUnitNum() ? NumConstant.ZERO : item.getTotalUnitNum(); // 总楼层总数 Integer totalFloorNum = null == item.getTotalFloorNum() ? NumConstant.ZERO : item.getTotalFloorNum(); // *总户数 Integer totalHouseNum = null == item.getTotalHouseNum() ? NumConstant.ZERO : item.getTotalHouseNum(); //总户数=以上三个数相乘 - Integer total=totalUnitNum*totalFloorNum*totalHouseNum; + Integer total=totalUnitNum*totalFloorNum*totalHouseNum;*/ + //02.11 之前录入的户数概念改为总户数,无需计算直接用就可以了 + Integer total = null == item.getTotalHouseNum() ? NumConstant.ZERO : item.getTotalHouseNum(); //已经添加了多少户 LambdaQueryWrapper icHouseEntityWrapper = new QueryWrapper().lambda() .in(IcHouseEntity::getBuildingId, item.getId());