From 508dd8dde98b7da379e56a819d1cb8d78b98a110 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 23 八月 2021 15:55:42 +0800
Subject: [PATCH] 随手拍新增图片宽高
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 200 ++++++++++++++++++++++++++++++-------------------
1 files changed, 122 insertions(+), 78 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 6f16f50..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
@@ -33,9 +33,7 @@
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
import java.util.Date;
import java.util.List;
@@ -152,9 +150,10 @@
"cmp.remark, " +
"cmp.native_place, " +
"cmp.nation, " +
- "cmp.label, " +
+ "cmpct.label, " +
"cmp.marriage, " +
"cmp.culture_level, " +
+ "cmp.profession, " +
"cmp.out_or_local, " +
"cmp.census_register, " +
"cmp.healthy, " +
@@ -164,15 +163,16 @@
"cmp.is_rent " +
"FROM " +
"com_mng_population AS cmp " +
+ " LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id " +
"<where>" +
"<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != ""'>" +
"AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
" </if> " +
"<if test='comMngPopulationVO.label != null and comMngPopulationVO.label != ""'>" +
- "AND cmp.label LIKE concat('%',#{comMngPopulationVO.label},'%') " +
+ "AND cmpct.label LIKE concat('%',#{comMngPopulationVO.label},'%') " +
" </if> " +
"<if test='comMngPopulationVO.actId != null'>" +
- " and cmp.act_id = #{comMngPopulationVO.actId} " +
+ " and cmpct.community_id = #{comMngPopulationVO.actId} " +
" </if> " +
"<if test='comMngPopulationVO.outOrLocal != null'>" +
" and cmp.out_or_local = #{comMngPopulationVO.outOrLocal} " +
@@ -205,7 +205,10 @@
"AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ >= ]]> #{comMngPopulationVO.ageEndTime} " +
" </if> " +
"<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageStartTime == comMngPopulationVO.ageEndTime'>" +
- "AND cmp.birthday = #{comMngPopulationVO.ageStartTime} " +
+ "AND cmp.birthday BETWEEN #{comMngPopulationVO.ageStartTimeEnd} and #{comMngPopulationVO.ageEndTime}" +
+ " </if> " +
+ "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageStartTime != comMngPopulationVO.ageEndTime'>" +
+ "AND cmp.birthday BETWEEN #{comMngPopulationVO.ageEndTimeEnd} and #{comMngPopulationVO.ageStartTime}" +
" </if> " +
"<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != ""'>" +
"AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +
@@ -222,9 +225,6 @@
"<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != ""'>" +
"AND cmp.remark = #{comMngPopulationVO.remark} " +
" </if> " +
- "<if test='comMngPopulationVO.address != null and comMngPopulationVO.address != ""'>" +
- "AND cmp.address like concat('%', #{comMngPopulationVO.address}, '%') " +
- " </if> " +
" </where>" +
" order by cmp.create_at desc" +
"</script>")
@@ -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>")
@@ -272,37 +274,48 @@
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 " +
- ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
- ",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " +
+ ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 1) as localTotal " +
+ ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmp.out_or_local = 2) as outTotal " +
+ ",(select count(cmpct.id) from com_mng_population_community_tags cmpct left join com_mng_population cmp on cmpct.population_id = cmp.id where cmpct.community_id = #{communityId} and cmpct.label is not null) as specialTotal " +
",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
- " from com_mng_population as cmp where act_id = #{communityId}")
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal " +
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal " +
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal " +
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal " +
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','刑满释放','%')) as rehabilitationTotal " +
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal " +
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal " +
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal " +
+ ",(select count(id) from com_mng_population_community_tags where community_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal " +
+ " from com_mng_population_community_tags as cmpct where community_id = #{communityId}")
ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
@Select("select count(id) as populationTotal," +
"IFNULL((select count(id) from com_mng_population_house where community_id = cmp.act_id),0) as houseTotal, " +
"IFNULL((select count(id) from com_mng_real_company where community_id = cmp.act_id),0) as companyTotal, " +
"IFNULL((select count(village_id) from com_mng_village where community_id = cmp.act_id),0) as villageTotal " +
- " from com_mng_population as cmp " +
- " where act_id = #{communityId}")
+ " com_mng_population_community_tags as cmpct " +
+ " where community_id = = #{communityId}")
IndexBasicsStatisticsVO getScreenIndexByBasics(@Param("communityId") Long communityId);
@Select("SELECT " +
" IFNULL( NULL, 1 ) AS type, " +
- " count( id ) AS sum " +
+ " count( cmpct.id ) AS sum " +
"FROM " +
- " com_mng_population " +
+ " com_mng_population_community_tags as cmpct " +
+ " left join com_mng_population as cmp on cmpct.population_id = cmp.id " +
"WHERE " +
- " sex = 1 " +
- " AND act_id = #{communityId} UNION ALL " +
+ " cmp.sex = 1 " +
+ " AND cmpct.community_id = #{communityId} UNION ALL " +
"SELECT " +
" IFNULL( NULL, 2 ) AS type, " +
" count( id ) AS sum " +
"FROM " +
- " com_mng_population " +
+ " com_mng_population_community_tags as cmpct " +
+ " left join com_mng_population as cmp on cmpct.population_id = cmp.id " +
"WHERE " +
- " sex = 2 " +
- " AND act_id = #{communityId}")
+ " cmp.sex = 2 " +
+ " AND cmpct.community_id = #{communityId}")
List<IndexPopulationSexStatisticsVO> getScreenIndexByPopulationSex(@Param("communityId") Long communityId);
@Select("SELECT " +
@@ -449,7 +462,7 @@
@Select("SELECT " +
" count( id ) " +
"FROM " +
- " com_mng_population " +
+ " com_mng_population_community_tags " +
"WHERE " +
" label like concat('%',#{label},'%')")
Integer getSpecialStatisticsByLabel(@Param("label") String label);
@@ -877,12 +890,12 @@
@Select("SELECT " +
" count( id ) AS specialTotal, " +
- " ( SELECT count( id ) FROM com_mng_population WHERE label IS NOT NULL AND act_id = #{communityId} AND create_at < #{lastMonth} ) AS toMonthSpecialTotal " +
+ " ( SELECT count( id ) FROM com_mng_population_community_tags WHERE label IS NOT NULL AND community_id = #{communityId} AND create_at < #{lastMonth} ) AS toMonthSpecialTotal " +
"FROM " +
- " com_mng_population AS cmp " +
+ " com_mng_population_community_tags AS cmpct " +
"WHERE " +
" label IS NOT NULL " +
- " AND act_id = #{communityId}")
+ " AND community_id = #{communityId}")
CivilPopulationStatisticsVO getCivilScreenPopulation(@Param("communityId") Long communityId, @Param("lastMonth") Date lastMonth);
@Select("SELECT `NAME`, " +
@@ -909,35 +922,36 @@
CivilVillageStatisticsVO getCivilScreenVillageStatistics(@Param("villageId") Long villageId);
- @Select("SELECT COUNT(id) AS man,(SELECT COUNT(id) FROM com_mng_population WHERE sex = 2 AND act_id = #{communityId}) AS woman FROM com_mng_population WHERE sex = 1 AND act_id = #{communityId}")
+ @Select("SELECT COUNT(cmpct.id) AS man,(SELECT COUNT(cmpct.id) FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id WHERE cmp.sex = 2 AND cmpct.community_id = #{communityId}) AS woman " +
+ "FROM com_mng_population_community_tags as cmpct left join com_mng_population as cmp on cmpct.population_id = cmp.id WHERE cmp.sex = 1 AND cmpct.community_id = #{communityId}")
Map<String, Long> countBySex(@Param("communityId") Long communityId);
@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")
@@ -946,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);
@@ -1025,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);
@@ -1042,8 +1057,9 @@
" cmp.`name`, " +
" cmp.phone, " +
" cmp.card_no, " +
- " cmp.label, " +
+ " cmpct.label, " +
" cmp.address, " +
+ " cmp.culture_level, " +
" cmp.nation, " +
" cmp.political_outlook, " +
" cmp.sex, " +
@@ -1064,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);
@@ -1076,7 +1093,7 @@
" SELECT " +
" cmp.id, " +
" cmp.`name` AS userName, " +
- " cmp.label, " +
+ " cmpct.label, " +
" cmp.card_no, " +
" cmp.card_no_str, " +
" cmp.sex, " +
@@ -1089,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_str like concat (#{populationListDTO.keyWord},'%') or cmp.address like concat (#{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} " +
@@ -1106,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} " +
@@ -1134,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> " +
@@ -1156,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);
@@ -1184,7 +1201,7 @@
" SELECT " +
" cmp.id, " +
" cmp.`name` AS userName, " +
- " cmp.label, " +
+ " cmpct.label, " +
" cmp.card_no, " +
" cmp.card_no_str, " +
" cmp.sex, " +
@@ -1197,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} " +
@@ -1220,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} " +
@@ -1233,18 +1250,45 @@
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);
+ @Insert("<script> " +
+ "insert into com_mng_population(`id`,`street_id`,`act_id`,`village_id`,`name`,`sex`,`certificate_type`,`card_no`" +
+ ",`card_no_expiration_date`,`card_no_str`,`road`,`door_no`,`floor`,`unit_no`,`house_no`,`political_outlook`" +
+ ",`work_company`,`special_situation`,`phone`,`out_or_local`,`census_register`,`person_type`,`country`" +
+ ",`date_of_departure`,`native_place`,`nation_code`,`nation`,`is_rent`,`culture_level`,`marriage`,`healthy`" +
+ ",`blood_type`,`religion`,`profession`,`person_status`,`death`,`head_portrait`,`monthly_income`,`family_status`" +
+ ",`birthday`,`goal_in_china`,`date_of_arrival`,`label`,`card_photo_front`,`card_photo_back`,`family_book`" +
+ ",`delete_flag`,`remark`,`create_at`,`update_at`,`residence`,`address`,`house_id`) values " +
+ "<foreach collection=\"populationList\" item=\"item\" index=\"index\" separator=\",\">\n" +
+ " (#{item.id},#{item.streetId},#{item.actId},#{item.villageId}" +
+ ",#{item.name},#{item.sex},#{item.certificateType},#{item.cardNo}" +
+ ",#{item.cardNoExpirationDate},#{item.cardNoStr},#{item.road},#{item.doorNo}" +
+ ",#{item.floor},#{item.unitNo},#{item.houseNo},#{item.politicalOutlook}" +
+ ",#{item.workCompany},#{item.specialSituation},#{item.phone},#{item.outOrLocal}" +
+ ",#{item.censusRegister},#{item.personType},#{item.country},#{item.dateOfDeparture}" +
+ ",#{item.nativePlace},#{item.nationCode},#{item.nation},#{item.isRent},#{item.cultureLevel}" +
+ ",#{item.marriage},#{item.healthy},#{item.bloodType},#{item.religion},#{item.profession}" +
+ ",#{item.personStatus},#{item.death},#{item.headPortrait},#{item.monthlyIncome},#{item.familyStatus}" +
+ ",#{item.birthday},#{item.goalInChina},#{item.dateOfArrival},#{item.label},#{item.cardPhotoFront}" +
+ ",#{item.cardPhotoBack},#{item.familyBook},#{item.deleteFlag},#{item.remark},now(),#{item.updateAt}" +
+ ",#{item.residence},#{item.address},#{item.houseId})" +
+ " </foreach>" +
+ " </script>")
+ void insertAll(@Param("populationList") List<ComMngPopulationDO> populationList);
+
+ void updateAll(@Param("populationList") List<ComMngPopulationDO> populationList);
+
}
--
Gitblit v1.7.1