java/zhihuishenqu.git

			@@ -103,6 +103,9 @@
			<if test='pageUserAppletsBackstageDTO.communityId != null and pageUserAppletsBackstageDTO.communityId != 0'>and
			u.community_id = #{pageUserAppletsBackstageDTO.communityId}
			</if>
			<if test='pageUserAppletsBackstageDTO.areaCode != null'>and
			a.area_code = #{pageUserAppletsBackstageDTO.areaCode}
			</if>
			<if test='pageUserAppletsBackstageDTO.status != null and pageUserAppletsBackstageDTO.status != 0'>and
			u.status=#{pageUserAppletsBackstageDTO.status}
			</if>
			@@ -121,10 +124,10 @@
			COUNT(user_id)allUser,
			COUNT(case WHEN DATE_FORMAT(t.create_at,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') then user_id else null end )addUser,
			COUNT(case WHEN DATE_FORMAT(last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') then user_id else null end )activeDayUser,
			(SELECT count(user_id) FROM sys_user t left join com_act t1 on t.community_id = t1.community_id WHERE type = 1 and t1.area_code = '510423' AND last_login_time > date_sub(SYSDATE(), INTERVAL 7 DAY))activeWeekUser
			(SELECT count(user_id) FROM sys_user t left join com_act t1 on t.community_id = t1.community_id WHERE type = 1 and t1.area_code = #{areaCode} AND last_login_time > date_sub(SYSDATE(), INTERVAL 7 DAY))activeWeekUser
			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 and t1.area_code ='510423'
			where t.type=1 and t.community_id is not null and t1.area_code = #{areaCode}
			</select>

			<select id="selectCommunityUserOrder" resultType="com.panzhihua.service_user.model.dtos.DataKanbanDTO">
			@@ -136,7 +139,7 @@
			AND last_login_time > DATE_FORMAT( date_sub( SYSDATE(), INTERVAL 0 DAY ), '%Y-%m-%d 00:00:00')) as dayNum
			FROM
			com_act a
			LEFT JOIN sys_user u ON a.community_id = u.community_id and u.type=1 where a.area_code = '510423'
			LEFT JOIN sys_user u ON a.community_id = u.community_id and u.type=1 where a.area_code = #{areaCode}
			GROUP BY a.community_id)t ORDER BY t.num desc
			</select>

			@@ -150,7 +153,7 @@
			FROM
			com_act a
			LEFT JOIN sys_user u ON a.community_id = u.community_id
			and u.type=1 and u.create_at >= DATE_ADD(curdate(),interval -day(curdate())+1 day) where a.area_code = '510423'
			and u.type=1 and u.create_at >= DATE_ADD(curdate(),interval -day(curdate())+1 day) where a.area_code = #{areaCode}
			GROUP BY a.community_id)t ORDER BY t.num desc
			</select>

			@@ -170,6 +173,7 @@
			sys_user u
			JOIN sys_user_role r ON u.user_id = r.user_id
			JOIN sys_role e ON r.role_id = e.role_id
			left join com_act ca on u.community_id = ca.community_id
			<if test='administratorsUserVO.roleId != null and administratorsUserVO.roleId!=0'>and
			e.role_id=#{administratorsUserVO.roleId}
			</if>
			@@ -182,6 +186,9 @@
			</if>
			<if test='administratorsUserVO.phone != null and administratorsUserVO.phone.trim() != ""'>AND
			u.phone like concat(#{administratorsUserVO.phone},'%')
			</if>
			<if test='administratorsUserVO.areaCode != null '>
			AND ca.area_code = #{administratorsUserVO.areaCode}
			</if>
			<if test='administratorsUserVO.account != null and administratorsUserVO.account.trim() != ""'>AND
			u.account like concat(#{administratorsUserVO.account},'%')
			@@ -201,12 +208,12 @@

			<select id="selectCommunityAddUserOrder" resultType="com.panzhihua.service_user.model.dtos.DataKanbanDTO">
			select count(user_id) as num,
			(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 t1.area_code = '510423'
			(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 t1.area_code = #{areaCode}
			AND last_login_time <![CDATA[ >= ]]> DATE_FORMAT( #{date1}, '%Y-%m-%d 00:00:00')
			AND last_login_time <![CDATA[ <= ]]> DATE_FORMAT( #{date1}, '%Y-%m-%d 23:59:59')) as dayNum from sys_user as su LEFT JOIN com_act t1 on su.community_id = t1.community_id
			where su.create_at <![CDATA[ >= ]]> DATE_SUB(DATE_FORMAT(#{date1},'%Y-%m-%d 00:00:00'),INTERVAL 0 DAY)
			and su.create_at <![CDATA[ <= ]]> DATE_SUB(DATE_FORMAT(#{date1},'%Y-%m-%d 23:59:59'),INTERVAL 0 DAY)
			and su.type = 1 and t1.area_code='510423'
			and su.type = 1 and t1.area_code=#{areaCode}
			</select>

			<update id="gridMemberEditStatus">
			@@ -430,7 +437,7 @@
			</update>

			<select id="selectCommunity" resultType="com.panzhihua.common.model.vos.community.ComActVO">
			select name from com_act where community_id = #{communityId}
			select * from com_act where community_id = #{communityId}
			</select>

			<delete id="delLcMember">
			@@ -471,7 +478,7 @@
			AND ca.street_id = cs.street_id
			) AS userNum
			FROM
			`com_street` AS cs where area_code='510423'
			`com_street` AS cs where area_code=#{areaCode}
			order by userNum desc
			</select>

			@@ -512,7 +519,7 @@
			LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id
			WHERE
			su.type = 1
			AND su.community_id IS NOT NULL and ca.area_code = '510423'
			AND su.community_id IS NOT NULL and ca.area_code = #{areaCode}
			GROUP BY
			ca.community_id
			ORDER BY