java/zhihuishenqu.git

			@@ -317,4 +317,11 @@
			ComActAcidRecordVO selectComActAcidRecord(Long id);

			ComActAcidMemberVO selectComActAcidMember(Long id);

			/**
			* 获取本月的
			* */
			Integer getMonthUsers(@Param("streetId") Long streetId,@Param("areaCode") Long areaCode,@Param("range") String range);


			}

			@@ -3449,7 +3449,10 @@
			if (monthRange){
			//获取本月的用户总数作为计算占比的用户总数
			IndexDataKanbanVO data = userDao.dataKanBanStreet(streetId, areaCode, date);
			vo.setRate(getRate(data.getAllUser(),userProportion.getUser()));
			Integer monthUsers = userDao.getMonthUsers(streetId, areaCode, date);
			log.info("总人数----"+data.getAllUser());
			log.info("人数-----"+userProportion.getUser());
			vo.setRate(getRate(monthUsers,userProportion.getUser()));
			}else{
			vo.setRate(getRate(analysisVO.getAllUser(),userProportion.getUser()));
			}
			@@ -3499,7 +3502,12 @@
			List<RealUser> realUsers = userDao.realUserCount(type, date, streetId, areaCode);
			List<RealUserAnalysisVO> realUserList=new ArrayList<>();
			realUserVO.setRealUserCount(getStreetRealUser(realUsers));
			realUserVO.setRealUserRate(NumberUtil.div(realUserVO.getRealUserCount(), analysisVO.getAllUser()).doubleValue());
			Integer rate = getRate(analysisVO.getAllUser(), realUserVO.getRealUserCount());
			if (null == rate){
			realUserVO.setRealUserRate(0.0);
			}else{
			realUserVO.setRealUserRate(rate.doubleValue());
			}
			for (RealUser realUser : realUsers) {
			RealUserAnalysisVO vo=new RealUserAnalysisVO();
			vo.setCount(realUser.getCount());

			@@ -690,5 +690,20 @@
			<select id="selectComActAcidMember" resultType="com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO">
			select * from com_act_acid_member where id = #{id}
			</select>
			<select id="getMonthUsers" resultType="java.lang.Integer">
			SELECT count(user_id)
			FROM
			sys_user t LEFT JOIN com_act t1 on t.community_id = t1.community_id
			where t.type=1 and t.community_id is not null
			<if test="streetId != null">
			and t1.street_id=#{streetId}
			</if>
			<if test="areaCode != null">
			and t1.area_code=#{areaCode}
			</if>
			<if test="range != null and range != ''">
			and t.create_at >= #{range}
			</if>
			</select>

			</mapper>

	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史