From c225d391b090bf72a7406fbb74484b5509508d24 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 27 二月 2023 16:01:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
index 1e9a480..f6ad587 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java
@@ -398,8 +398,10 @@
public R basicData(Long communityId) {
BuildingListHeaderStatisticsAdminVo buildingListHeaderStatisticsAdminVo=comScreenDao.buildingListHeaderStatisticsAdmin(communityId);
BasicDataVO vo=new BasicDataVO();
+ vo.setVillage(buildingListHeaderStatisticsAdminVo.getBuildNum());
vo.setPeople(buildingListHeaderStatisticsAdminVo.getPopulationNum());
- vo.setBuildings(buildingListHeaderStatisticsAdminVo.getBuildNum());
+ vo.setBuildings(buildingListHeaderStatisticsAdminVo.getHouseNum());
+// vo.setBuildings(comScreenDao.assetAnalysis(communityId));
return R.ok(vo);
}
--
Gitblit v1.7.1