From 48b04dd65d5276eae9ef2ab7e6fa2cf9ec3eadfc Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 15 七月 2021 09:29:59 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 1443389..fa97328 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -264,7 +264,7 @@
"(select city_name from com_mng_struct_area_city where city_adcode = #{cityCode}) as city," +
"(select district_name from com_mng_struct_area_district where district_adcode = #{districtCode}) as district" +
"</script>")
- AreaAddressVO getAreaAddress(@Param("provinceCode") String provinceCode,@Param("cityCode") String cityCode,@Param("districtCode") String districtCode);
+ AreaAddressVO getAreaAddress(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("districtCode") String districtCode);
@Select("select count(id) as populationTotal " +
",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 1) as localTotal " +
@@ -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> " +
@@ -828,7 +882,7 @@
"WHERE " +
" label IS NOT NULL " +
" AND act_id = #{communityId}")
- CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId,@Param("lastMonth") Date lastMonth);
+ CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId, @Param("lastMonth") Date lastMonth);
@Select("SELECT `NAME`, " +
" user_sum, " +
@@ -871,7 +925,7 @@
"(SELECT (SELECT TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 45 and aa.age<= 55) AS age55," +
"(SELECT COUNT(aa.age) FROM " +
"(SELECT (SELECT TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 55) AS age55over")
- Map<String, Long> countByAge(@Param("communityId")Long communityId);
+ Map<String, Long> countByAge(@Param("communityId") Long communityId);
@Select("SELECT COUNT(id)AS xx," +
"(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 2 AND act_id = #{communityId}) as cz," +
@@ -883,10 +937,10 @@
"(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 8 AND act_id = #{communityId}) as bs," +
"(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 9 AND act_id = #{communityId}) as qt" +
" FROM com_mng_population WHERE culture_level = 1 AND act_id = #{communityId}")
- Map<String, Long> countByCulture(@Param("communityId")Long communityId);
+ Map<String, Long> countByCulture(@Param("communityId") Long communityId);
@Select("select count(user_id) from sys_user where community_id = #{communityId} and type = 1")
- Long countUsedCommunityPopulation(@Param("communityId")Long communityId);
+ Long countUsedCommunityPopulation(@Param("communityId") Long communityId);
@Select(
"SELECT " +
@@ -902,7 +956,7 @@
"(SELECT (SELECT TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 45 and aa.age<= 55) AS age55," +
"(SELECT COUNT(aa.age) FROM " +
"(SELECT (SELECT TIMESTAMPDIFF(YEAR, birthday, CURDATE()) ) AS age FROM com_mng_population WHERE act_id = #{communityId}) AS aa WHERE aa.age > 55) AS age55over")
- Map<String, Long> indexCountByAge(@Param("communityId")Long communityId);
+ Map<String, Long> indexCountByAge(@Param("communityId") Long communityId);
@Select("SELECT " +
@@ -921,7 +975,7 @@
" LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id " +
"WHERE " +
" id = #{eventId}")
- EventNewStatisticsVO getEventScreenSSPDateil(@Param("eventId")Long eventId);
+ EventNewStatisticsVO getEventScreenSSPDateil(@Param("eventId") Long eventId);
@Select("SELECT " +
" su.nick_name AS userName, " +
@@ -1061,7 +1115,7 @@
"AND population.eventStatus = #{populationListDTO.eventStatus} " +
" </if> " +
" </script>")
- IPage<ComMngPopulationListVO> getGridPopulationAdminList(Page page,@Param("populationListDTO") ComMngPopulationListDTO populationListDTO);
+ IPage<ComMngPopulationListVO> getGridPopulationAdminList(Page page, @Param("populationListDTO") ComMngPopulationListDTO populationListDTO);
@Select("select relation from com_mng_population_house_user where house_id = #{houseId} and popul_id = #{populationId}")
Integer getPopulationRelationByHouseId(@Param("houseId") Long houseId, @Param("populationId") Long populationId);
@@ -1096,7 +1150,7 @@
"</foreach>" +
" </if> " +
" </script>")
- IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO);
+ IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page, @Param("populationDTO") PageComMngPopulationDTO populationDTO);
@Select("<script> " +
"SELECT " +
@@ -1189,6 +1243,7 @@
" AND label like concat ('%',#{villagePopulationDTO.label},'%') " +
" </if> " +
" </script>")
- IPage<ComMngVillagePopulationListVO> getVillagePopulationAdmin(Page page,@Param("villagePopulationDTO") PageComMngVillagePopulationDTO villagePopulationDTO);
+ IPage<ComMngVillagePopulationListVO> getVillagePopulationAdmin(Page page, @Param("villagePopulationDTO") PageComMngVillagePopulationDTO villagePopulationDTO);
}
+
--
Gitblit v1.7.1