java/zhihuishenqu.git

			@@ -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,9 +396,7 @@

			@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.setPeople(buildingListHeaderStatisticsAdminVo.getPopulationNum());
			vo.setBuildings(buildingListHeaderStatisticsAdminVo.getBuildNum());