From e1ac737788bb47b1015096343b8085dbcfe6a890 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 11 Feb 2022 17:21:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A5=BC=E5=AE=87=E6=98=AF?= =?UTF-8?q?=E6=88=B7=E6=95=B0=E5=90=8D=E8=AF=8D=E6=94=B9=E4=B8=BA=E6=80=BB?= =?UTF-8?q?=E6=88=B7=E6=95=B0=EF=BC=8C=E5=B7=A6=E8=BE=B9=E6=A0=91=E6=97=A0?= =?UTF-8?q?=E9=9C=80=E8=AE=A1=E7=AE=97=E6=80=BB=E6=88=B7=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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());