java/zhihuishenqu.git

			@@ -454,6 +454,11 @@
			" count( egd.id ) AS gridTotal, " +
			" ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " +
			" ( " +
			" SELECT " +
			" count( e.id ) " +
			" FROM " +
			" `event` AS e " +
			" LEFT JOIN event_grid_data AS egd1 ON e.grid_id = egd1.id " +
			" WHERE " +
			" egd1.grid_community_id = egd.grid_community_id " +
			" AND event_status = 2 " +
			@@ -466,6 +471,10 @@
			" ) AS eventTotal, " +
			" ( " +
			" SELECT " +
			" count( e1.id ) " +
			" FROM " +
			" `event` AS e1 " +
			" LEFT JOIN event_grid_data AS egd2 ON e1.grid_id = egd2.id " +
			" WHERE " +
			" egd2.grid_community_id = egd.grid_community_id " +
			" AND event_status = 2 " +
			@@ -478,6 +487,11 @@
			" AND event_deal_status IN ( 1, 2, 3 )) AS noSolveEventTotal, " +
			" ( " +
			" SELECT " +
			" count( e1.id ) " +
			" FROM " +
			" `event` AS e1 " +
			" LEFT JOIN event_grid_data AS egd2 ON e1.grid_id = egd2.id " +
			" WHERE " +
			" egd2.grid_community_id = egd.grid_community_id " +
			" AND event_status = 2 " +
			" AND event_deal_status = 4 " +
			@@ -517,6 +531,8 @@
			" count( e.id ) AS eventZATotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e1.id ) " +
			" FROM " +
			" `event` AS e1 " +
			" LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id " +
			" WHERE " +
			@@ -534,6 +550,10 @@
			" ), " +
			" 0 " +
			" ) AS yesEventZATotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e2.id ) " +
			" FROM " +
			" `event` AS e2 " +
			" LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id " +
			" WHERE " +
			@@ -551,6 +571,10 @@
			" ), " +
			" 0 " +
			" ) AS eventTFTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e3.id ) " +
			" FROM " +
			" `event` AS e3 " +
			" LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id " +
			" WHERE " +
			@@ -568,6 +592,10 @@
			" ), " +
			" 0 " +
			" ) AS yesEventTFTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e4.id ) " +
			" FROM " +
			" `event` AS e4 " +
			" LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " +
			" WHERE " +
			@@ -585,6 +613,10 @@
			" ), " +
			" 0 " +
			" ) AS eventTSTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e5.id ) " +
			" FROM " +
			" `event` AS e5 " +
			" LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id " +
			" WHERE " +
			@@ -602,6 +634,10 @@
			" ), " +
			" 0 " +
			" ) AS yesEventTSTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e6.id ) " +
			" FROM " +
			" `event` AS e6 " +
			" LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id " +
			" WHERE " +
			@@ -619,6 +655,10 @@
			" ), " +
			" 0 " +
			" ) AS eventMDTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e7.id ) " +
			" FROM " +
			" `event` AS e7 " +
			" LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id " +
			" WHERE " +
			@@ -636,6 +676,10 @@
			" ), " +
			" 0 " +
			" ) AS yesEventMDTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e8.id ) " +
			" FROM " +
			" `event` AS e8 " +
			" LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id " +
			" WHERE " +
			@@ -653,6 +697,10 @@
			" ), " +
			" 0 " +
			" ) AS eventBWDTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e9.id ) " +
			" FROM " +
			" `event` AS e9 " +
			" LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id " +
			" WHERE " +
			@@ -670,6 +718,10 @@
			" ), " +
			" 0 " +
			" ) AS yesEventBWDTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e10.id ) " +
			" FROM " +
			" `event` AS e10 " +
			" LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id " +
			" WHERE " +
			@@ -687,6 +739,10 @@
			" ), " +
			" 0 " +
			" ) AS eventGGTotal, " +
			" IFNULL(( " +
			" SELECT " +
			" count( e11.id ) " +
			" FROM " +
			" `event` AS e11 " +
			" LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id " +
			" WHERE " +
			@@ -727,9 +783,6 @@
			" LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
			"WHERE " +
			" egd.grid_community_id = #{screenEventDTO.communityId} " +
			" egd.grid_community_id = #{communityId} " +
			" AND event_category = 1 " +
			" AND event_type = 1 " +
			" AND event_status = 2 " +
			"<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
			" AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
			@@ -786,6 +839,10 @@
			" event_type AS type, " +
			" e.id AS eventId, " +
			" happent_lat_lng AS latLng " +
			"FROM " +
			" `event` AS e " +
			" LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
			"WHERE " +
			" e.event_category = 1 " +
			" AND e.event_type IN ( 1, 2, 3, 4, 5, 6 ) " +
			" AND e.event_status = 2 " +
			@@ -807,9 +864,6 @@
			" com_act_easy_photo " +
			"WHERE " +
			" community_id = #{screenEventDTO.communityId} " +
			" community_id = #{communityId} " +
			" AND del_tag = 0 " +
			" AND lng_lat IS NOT NULL " +
			"<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
			" AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
			" </if> " +
			@@ -1192,3 +1246,4 @@
			IPage<ComMngVillagePopulationListVO> getVillagePopulationAdmin(Page page,@Param("villagePopulationDTO") PageComMngVillagePopulationDTO villagePopulationDTO);

			}