From da9488337f2f350c08b068fe1fcf31c82710c54c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 13 十月 2021 09:42:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 162 ++++++++---------------------------------------------
1 files changed, 26 insertions(+), 136 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 4e216cf..900c555 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
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.service_community.model.dos.ComMngPopulationCommunityTagsDO;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -239,8 +240,8 @@
+ " event_category = 1 " + " AND event_type = 6 " + " AND event_status = 2 "
+ " AND egd3.grid_community_id = #{communityId} " + " ), " + " 0 " + " ) AS eventTSTotal, "
+ " IFNULL(( " + " SELECT " + " count( e4.id ) " + " FROM " + " `event` AS e4 "
- + " LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " + " WHERE " + " event_category = 1 "
- + " AND event_type = 4 " + " AND event_status = 2 " + " AND egd4.grid_community_id = #{communityId} "
+ + " LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " + " WHERE " + " event_category = 2 "
+ + " AND event_status = 2 " + " AND egd4.grid_community_id = #{communityId} "
+ " ), " + " 0 " + " ) AS eventBWDTotal, " + " IFNULL(( " + " SELECT " + " count( e5.id ) " + " FROM "
+ " `event` AS e5 " + " LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id " + " WHERE "
+ " event_category = 1 " + " AND event_type = 2 " + " AND event_status = 2 "
@@ -307,112 +308,11 @@
+ "GROUP BY " + " months " + "ORDER BY " + " count( e.id ) DESC " + " LIMIT 3")
List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);
- @Select("<script> " + "SELECT " + " 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 "
- + " egd1.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 1 " + " AND event_deal_status = 4 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd2.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 5 " + " AND event_status = 2 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e2.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e2.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd3.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 5 " + " AND event_deal_status = 4 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e3.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e3.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd4.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 6 " + " AND event_status = 2 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e4.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e4.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd5.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 6 " + " AND event_deal_status = 4 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e5.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e5.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd6.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 3 " + " AND event_status = 2 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e6.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e6.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd7.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 3 " + " AND event_deal_status = 4 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e7.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e7.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd8.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 4 " + " AND event_status = 2 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e8.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e8.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd9.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 4 " + " AND event_deal_status = 4 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e9.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e9.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd10.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 2 " + " AND event_status = 2 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e10.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e10.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 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 "
- + " egd11.grid_community_id = #{screenEventDTO.communityId} " + " AND event_category = 1 "
- + " AND event_type = 2 " + " AND event_deal_status = 4 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e11.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e11.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " ), " + " 0 "
- + " ) AS yesEventGGTotal, "
- + " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{screenEventDTO.communityId} "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + "), 0 ) AS eventSSPTotal, "
- + " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND status = 4 AND community_id = #{screenEventDTO.communityId} "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + "), 0 ) AS yesEventSSPTotal "
- + "FROM " + " `event` AS e " + " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " + "WHERE "
- + " egd.grid_community_id = #{screenEventDTO.communityId} " + " AND event_status = 2 "
- + "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>"
- + " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " + " </if> "
- + "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != ""'>"
- + " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " + " </if> " + " </script>")
+ /**
+ * 综治事件大屏统计数据
+ * @param screenEventDTO 请求参数
+ * @return 大屏统计数据
+ */
EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
@Select("SELECT " + " su.nick_name AS userName, " + " su.image_url AS imageUrl, " + " e.happen_time as createAt, "
@@ -549,36 +449,26 @@
IPage<PopulationListVO> pagePopulationListApp(Page page,
@Param("populationListDTO") PagePopulationListDTO populationListDTO);
- @Select("SELECT " + " cmp.id, " + " cmp.`name`, " + " cmp.phone, " + " cmp.card_no, " + " cmpct.label, "
- + " cmp.address, " + " cmp.culture_level, " + " cmp.nation, " + " cmp.political_outlook, " + " cmp.sex, "
- + " cmp.birthday, " + " cmp.native_place, " + " cmp.healthy, " + " cmp.is_rent, " + " cmv.alley AS road, "
- + " cmv.house_num AS doorNo, " + " cmp.floor, " + " cmp.unit_no, " + " cmp.house_no, " + " cmp.work_company, "
- + " cmp.census_register, " + " cmp.out_or_local, " + " cmp.remark, " + " cmp.marriage " + "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 "
- + " cmp.id = #{populationId}")
+ /**
+ * 根据人口id查询人口详情
+ * @param populationId 人口id
+ * @return 人口详情
+ */
PopulationDetailVO getPopulationDetailApp(@Param("populationId") Long populationId);
- @Select("<script> " + " SELECT " + " cmp.id, " + " cmp.`name` AS userName, "
- + " cmpct.label, " + " cmp.card_no, " + " cmp.card_no_str, " + " cmp.sex, " + " cmp.address, "
- + " cmp.political_outlook, " + " cmp.census_register, " + " cmp.house_id, " + " cmp.phone, "
- + " IFNULL(cmp.house_id,0) as isHouse, "
- + " ( 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 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 cmpct.label like concat ('%',#{populationListDTO.label},'%') " + " </if> "
- + "<if test='populationListDTO.sex != null'>" + "AND cmp.sex = #{populationListDTO.sex} " + " </if> "
- + "<if test='populationListDTO.isHouse != null and populationListDTO.isHouse == 1'>"
- + "AND cmp.house_id is not null " + " </if> "
- + "<if test='populationListDTO.isHouse != null and populationListDTO.isHouse == 2'>"
- + "AND cmp.house_id is null " + " </if> " + "<if test='populationListDTO.communityId != null'>"
- + "AND cmpct.community_id = #{populationListDTO.communityId} " + " </if> "
- + "<if test='populationListDTO.politicalOutlook != null'>"
- + "AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " + " </if> " + " </script>")
+ /**
+ * 根据人口id查询人口在各个社区的标签列表
+ * @param populationId 人口id
+ * @return 人口在各个社区的标签列表
+ */
+ List<ComMngPopulationCommunityTagsVo> getCommunityTagList(@Param("populationId") Long populationId);
+
+ /**
+ * 综治后台-分页查询居民列表
+ * @param page 分页参数
+ * @param populationListDTO 请求参数
+ * @return 居民列表
+ */
IPage<ComMngPopulationListVO> getGridPopulationAdminList(Page page,
@Param("populationListDTO") ComMngPopulationListDTO populationListDTO);
--
Gitblit v1.7.1