From 91275344f85d2777be0f276e9d9da3f6f3fa6728 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 20 八月 2021 18:48:44 +0800
Subject: [PATCH] 实有人口和社区关系以及对应标签修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 102 ++++++++++++++++++++++++++------------------------
1 files changed, 53 insertions(+), 49 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 222a9ef..0c8a560 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
@@ -232,7 +232,9 @@
@Select("<script> " +
"select cmp.id,cmv.`alley` as areaName,cmp.`name`,cmp.phone,cmp.label as tags,cmp.create_at from com_mng_population as cmp " +
- "left join com_mng_village as cmv on cmv.village_id = cmp.village_id where cmp.act_id = #{pageInputUserDTO.communityId} and cmp.label is not null " +
+ "left join com_mng_village as cmv on cmv.village_id = cmp.village_id " +
+ "left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id " +
+ "where cmpct.community_id = #{pageInputUserDTO.communityId} and cmpct.label is not null " +
"<if test='pageInputUserDTO.name != null and pageInputUserDTO.name != ""'>" +
" AND cmp.`name` LIKE concat(#{pageInputUserDTO.name},'%') " +
" </if> " +
@@ -240,7 +242,7 @@
" AND cmv.`alley` LIKE concat(#{pageInputUserDTO.areaName},'%') " +
" </if> " +
"<if test='pageInputUserDTO.tags != null and pageInputUserDTO.tags != ""'>" +
- " AND cmp.label like concat('%',#{pageInputUserDTO.tags},'%') " +
+ " AND cmpct.label like concat('%',#{pageInputUserDTO.tags},'%') " +
" </if> " +
" order by cmp.create_at desc " +
"</script>")
@@ -927,29 +929,29 @@
@Select(
"SELECT " +
"(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<= 16) as age16," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) as aa where aa.age<= 16) as age16," +
"(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 > 16 and aa.age<= 25) AS age25," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 16 and aa.age<= 25) AS age25," +
"(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 > 25 and aa.age<= 35) AS age35," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 25 and aa.age<= 35) AS age35," +
"(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 > 35 and aa.age<= 45) AS age45," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 35 and aa.age<= 45) AS age45," +
"(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 > 45 and aa.age<= 55) AS age55," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_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")
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 55) AS age55over")
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," +
- "(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 3 AND act_id = #{communityId}) as gz," +
- "(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 4 AND act_id = #{communityId}) as zz," +
- "(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 5 AND act_id = #{communityId}) as dz," +
- "(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 6 AND act_id = #{communityId}) as bk," +
- "(SELECT COUNT(id) FROM com_mng_population WHERE culture_level = 7 AND act_id = #{communityId}) as ss," +
- "(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}")
+ @Select("SELECT COUNT(cmp.id)AS xx," +
+ "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 2 AND cmpct.community_id = #{communityId}) as cz," +
+ "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 3 AND cmpct.community_id = #{communityId}) as gz," +
+ "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 4 AND cmpct.community_id = #{communityId}) as zz," +
+ "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 5 AND cmpct.community_id = #{communityId}) as dz," +
+ "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 6 AND cmpct.community_id = #{communityId}) as bk," +
+ "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 7 AND cmpct.community_id = #{communityId}) as ss," +
+ "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 8 AND cmpct.community_id = #{communityId}) as bs," +
+ "(SELECT COUNT(cmp.id) FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 9 AND cmpct.community_id = #{communityId}) as qt" +
+ " FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE culture_level = 1 AND cmpct.community_id = #{communityId}")
Map<String, Long> countByCulture(@Param("communityId") Long communityId);
@Select("select count(user_id) from sys_user where community_id = #{communityId} and type = 1")
@@ -958,17 +960,17 @@
@Select(
"SELECT " +
"(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<= 16) as age16," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) as aa where aa.age<= 16) as age16," +
"(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 > 16 and aa.age<= 27) AS age27," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 16 and aa.age<= 27) AS age27," +
"(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 > 27 and aa.age<= 35) AS age35," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 27 and aa.age<= 35) AS age35," +
"(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 > 35 and aa.age<= 45) AS age45," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 35 and aa.age<= 45) AS age45," +
"(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 > 45 and aa.age<= 55) AS age55," +
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_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")
+ "(SELECT (SELECT TIMESTAMPDIFF(YEAR, cmp.birthday, CURDATE()) ) AS age FROM com_mng_population as cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id WHERE cmpct.community_id = #{communityId}) AS aa WHERE aa.age > 55) AS age55over")
Map<String, Long> indexCountByAge(@Param("communityId") Long communityId);
@@ -1037,14 +1039,15 @@
Integer getStatisticsCount(@Param("communityId") Long communityId);
@Select("<script> " +
- "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.label,cmp.address,cmp.nation,cmp.political_outlook,cmv.lng,cmv.lat" +
+ "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmpct.label,cmp.address,cmp.nation,cmp.political_outlook,cmv.lng,cmv.lat" +
",cmp.sex from com_mng_population as cmp left join com_mng_village as cmv on cmv.village_id = cmp.village_id " +
- " where cmp.act_id = #{populationListDTO.communityId}" +
+ " left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id " +
+ " where cmpct.community_id = #{populationListDTO.communityId}" +
"<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != ""'>" +
"AND (cmp.`name` like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%')) " +
" </if> " +
"<if test='populationListDTO.label != null and populationListDTO.label != ""'>" +
- "AND cmp.label like concat ('%',#{populationListDTO.label},'%') " +
+ "AND cmpct.label like concat ('%',#{populationListDTO.label},'%') " +
" </if> " +
" </script>")
IPage<PopulationListVO> pagePopulationListApp(Page page, @Param("populationListDTO") PagePopulationListDTO populationListDTO);
@@ -1054,7 +1057,7 @@
" cmp.`name`, " +
" cmp.phone, " +
" cmp.card_no, " +
- " cmp.label, " +
+ " cmpct.label, " +
" cmp.address, " +
" cmp.culture_level, " +
" cmp.nation, " +
@@ -1077,6 +1080,7 @@
"FROM " +
" com_mng_population AS cmp " +
" LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +
+ " left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id " +
"WHERE " +
" id = #{populationId}")
PopulationDetailVO getPopulationDetailApp(@Param("populationId") Long populationId);
@@ -1089,7 +1093,7 @@
" SELECT " +
" cmp.id, " +
" cmp.`name` AS userName, " +
- " cmp.label, " +
+ " cmpct.label, " +
" cmp.card_no, " +
" cmp.card_no_str, " +
" cmp.sex, " +
@@ -1102,12 +1106,12 @@
" ( SELECT event_status FROM event_visiting_tasks WHERE event_status in (1,2,3,5) AND visiter_id = cmp.id ORDER BY create_at DESC LIMIT 1 ) AS eventStatus, " +
" ( SELECT create_at FROM event_visiting_tasks WHERE event_status in (1,2,3,5) AND visiter_id = cmp.id ORDER BY create_at DESC LIMIT 1 ) AS createAt " +
" FROM " +
- " com_mng_population AS cmp where 1=1 " +
+ " com_mng_population AS cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id where 1=1 " +
"<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != ""'>" +
"AND (cmp.name like concat (#{populationListDTO.keyWord},'%') or cmp.card_no = #{populationListDTO.cardNo} or cmp.address like concat (#{populationListDTO.keyWord},'%')) " +
" </if> " +
"<if test='populationListDTO.label != null and populationListDTO.label != ""'>" +
- "AND cmp.label like concat ('%',#{populationListDTO.label},'%') " +
+ "AND cmpct.label like concat ('%',#{populationListDTO.label},'%') " +
" </if> " +
"<if test='populationListDTO.sex != null'>" +
"AND cmp.sex = #{populationListDTO.sex} " +
@@ -1119,7 +1123,7 @@
"AND cmp.house_id is null " +
" </if> " +
"<if test='populationListDTO.communityId != null'>" +
- "AND cmp.act_id = #{populationListDTO.communityId} " +
+ "AND cmpct.community_id = #{populationListDTO.communityId} " +
" </if> " +
"<if test='populationListDTO.politicalOutlook != null'>" +
"AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " +
@@ -1147,13 +1151,13 @@
" cmp.id, " +
" cmp.`name`, " +
" cmp.card_no as idCard, " +
- " cmp.label, " +
+ " cmpct.label, " +
" cmp.sex, " +
" IFNULL( cmp.phone, '暂无' ) as phone, " +
" cmp.address, " +
" cmp.political_outlook " +
" FROM " +
- " com_mng_population AS cmp where 1=1 " +
+ " com_mng_population AS cmp left join com_mng_population_community_tags as cmpct on cmp.id = cmpct.population_id where 1=1 " +
"<if test='populationDTO.keyWord != null'>" +
" AND (cmp.name like concat(#{populationDTO.keyWord},'%') or cmp.card_no_str like concat(#{populationDTO.keyWord},'%')) " +
" </if> " +
@@ -1169,22 +1173,22 @@
@Select("<script> " +
"SELECT " +
" count( id ) AS localNum, " +
- " ( SELECT count( id ) FROM com_mng_population WHERE out_or_local = 2 " +
+ " ( SELECT count( cmpct.id ) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id WHERE cmp.out_or_local = 2 " +
"<if test='communityId != null and communityId != 0'>" +
- " AND act_id = #{communityId} " +
+ " AND cmpct.community_id = #{communityId} " +
" </if> " +
" ) AS flowNum, " +
- " ( SELECT count( id ) FROM com_mng_population WHERE label IS NOT NULL " +
+ " ( SELECT count( cmpct.id ) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id WHERE cmpct.label IS NOT NULL " +
"<if test='communityId != null and communityId != 0'>" +
- " AND act_id = #{communityId} " +
+ " AND cmpct.community_id = #{communityId} " +
" </if> " +
" ) AS specialNum " +
"FROM " +
- " com_mng_population " +
+ " com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmp.id = cmpct.population_id " +
"WHERE " +
- " out_or_local = 1 " +
+ " cmp.out_or_local = 1 " +
"<if test='communityId != null and communityId != 0'>" +
- " AND act_id = #{communityId} " +
+ " AND cmpct.community_id = #{communityId} " +
" </if> " +
" </script>")
PopulationStatisticsVO getGridPopulationStatistics(@Param("communityId") Long communityId);
@@ -1197,7 +1201,7 @@
" SELECT " +
" cmp.id, " +
" cmp.`name` AS userName, " +
- " cmp.label, " +
+ " cmpct.label, " +
" cmp.card_no, " +
" cmp.card_no_str, " +
" cmp.sex, " +
@@ -1210,12 +1214,12 @@
" ( SELECT event_status FROM event_visiting_tasks WHERE event_status in (1,2,3,5) AND visiter_id = cmp.id ORDER BY create_at DESC LIMIT 1 ) AS eventStatus, " +
" ( SELECT create_at FROM event_visiting_tasks WHERE event_status in (1,2,3,5) AND visiter_id = cmp.id ORDER BY create_at DESC LIMIT 1 ) AS createAt " +
" FROM " +
- " com_mng_population AS cmp where 1=1 " +
+ " com_mng_population AS cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id where 1=1 " +
"<if test='populationExportDTO.keyWord != null and populationExportDTO.keyWord != ""'>" +
"AND (cmp.name like concat (#{populationExportDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationExportDTO.keyWord},'%') or cmp.address like concat (#{populationExportDTO.keyWord},'%')) " +
" </if> " +
"<if test='populationExportDTO.label != null and populationExportDTO.label != ""'>" +
- "AND cmp.label like concat ('%',#{populationExportDTO.label},'%') " +
+ "AND cmpct.label like concat ('%',#{populationExportDTO.label},'%') " +
" </if> " +
"<if test='populationExportDTO.sex != null'>" +
"AND cmp.sex = #{populationExportDTO.sex} " +
@@ -1233,7 +1237,7 @@
"AND cmp.house_id is null " +
" </if> " +
"<if test='populationExportDTO.communityId != null'>" +
- "AND cmp.act_id = #{populationExportDTO.communityId} " +
+ "AND cmpct.community_id = #{populationExportDTO.communityId} " +
" </if> " +
"<if test='populationExportDTO.politicalOutlook != null'>" +
"AND cmp.political_outlook = #{populationExportDTO.politicalOutlook} " +
@@ -1246,15 +1250,15 @@
List<ComMngPopulationListVO> getGridPopulationAdminLists(@Param("populationExportDTO") ComMngPopulationExportDTO populationExportDTO);
@Select("<script> " +
- " select id,`name`,card_no,label from com_mng_population where 1=1 " +
+ " select cmp.id,cmp.`name`,cmp.card_no,cmtct.label from com_mng_population as cmp left join com_mng_population_community_tags AS cmpct on cmp.id = cmpct.population_id where 1=1 " +
"<if test='villagePopulationDTO.villageId != null'>" +
- " and village_id = #{villagePopulationDTO.villageId} " +
+ " and cmp.village_id = #{villagePopulationDTO.villageId} " +
" </if> " +
"<if test='villagePopulationDTO.keyWord != null'>" +
- " AND (name like concat (#{villagePopulationDTO.keyWord},'%') or card_no_str like concat (#{villagePopulationDTO.keyWord},'%')) " +
+ " AND (cmp.name like concat (#{villagePopulationDTO.keyWord},'%') or cmp.card_no_str like concat (#{villagePopulationDTO.keyWord},'%')) " +
" </if> " +
"<if test='villagePopulationDTO.label != null and villagePopulationDTO.label != ""'>" +
- " AND label like concat ('%',#{villagePopulationDTO.label},'%') " +
+ " AND cmpct.label like concat ('%',#{villagePopulationDTO.label},'%') " +
" </if> " +
" </script>")
IPage<ComMngVillagePopulationListVO> getVillagePopulationAdmin(Page page, @Param("villagePopulationDTO") PageComMngVillagePopulationDTO villagePopulationDTO);
--
Gitblit v1.7.1