From 8c0b5b30e5200e7bd45aa34507c3623e17fcce91 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 24 八月 2023 13:47:24 +0800
Subject: [PATCH] 新增小程序积分列表 修改积分发放流程
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ScreenWorkServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 a2dd032..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
@@ -16,6 +16,7 @@
import com.panzhihua.common.model.vos.puda.DynamicVO;
import com.panzhihua.common.model.vos.puda.SpecialPeopleVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.service_community.service.ComActBuildingService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -60,7 +61,7 @@
@Resource
private ComScreenDao comScreenDao;
@Resource
- private CommunityService communityService;
+ private ComActBuildingService comActBuildingService;
@Override
public R statisticNeighborCircle(Long communityId) {
@@ -355,6 +356,7 @@
@Override
public R citizenInfo(Long communityId) {
DateVO vo=new DateVO();
+ vo.setCommunityId(communityId);
//当前日期
vo.setNow(DateUtil.now());
//16年前
@@ -368,7 +370,7 @@
//55年前
vo.setOffset55(DateUtil.offsetMonth(DateUtil.date(), -660).toDateStr());
CitizenInfoVO citizenInfoVO = comScreenDao.ageRange(vo);
- citizenInfoVO.setTotal(comScreenDao.peopleInfoAdmin(communityId).getPopulationNum());
+ citizenInfoVO.setTotal(comScreenDao.buildingListHeaderStatisticsAdmin(communityId).getPopulationNum());
citizenInfoVO.setMaleRate(NumberUtil.div(citizenInfoVO.getMaleNum(), citizenInfoVO.getTotal(), 2));
citizenInfoVO.setFemaleRate(NumberUtil.div(citizenInfoVO.getFemaleNum(), citizenInfoVO.getTotal(), 2));
//男性占比
@@ -394,12 +396,12 @@
@Override
public R basicData(Long communityId) {
- //PageBuildingListAdminVo pageBuildingListAdminVo = comScreenDao.peopleInfoAdmin(communityId);
- R r = communityService.buildingListHeaderStatisticsAdmin(communityId);
- BuildingListHeaderStatisticsAdminVo buildingListHeaderStatisticsAdminVo = (BuildingListHeaderStatisticsAdminVo)r.getData();
+ 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