From d01be9f1ec9a393818ea64deca3cbe7fa9372e08 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 23 六月 2021 18:21: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 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 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 f4ceba7..30d4123 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
@@ -14,6 +15,7 @@
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.index.*;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
+import com.panzhihua.common.model.vos.grid.PopulationListVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.model.vos.community.PageComActMessageVO;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
@@ -244,6 +246,7 @@
",(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(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
" from com_mng_population as cmp where act_id = #{communityId}")
ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
@@ -736,6 +739,17 @@
" community_id = #{communityId}")
List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);
+ @Select("SELECT " +
+ " count( id ) AS peopleNum, " +
+ " ( SELECT count( id ) FROM com_mng_population_house AS cmph WHERE village_id = #{villageId} ) AS houseNum, " +
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 1 ) AS registerNum, " +
+ " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 2 ) AS flowNum " +
+ "FROM " +
+ " com_mng_population AS cmp " +
+ "WHERE " +
+ " village_id = #{villageId}")
+ 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}")
Map<String, Long> countBySex(@Param("communityId") Long communityId);
@@ -809,15 +823,18 @@
@Select("SELECT " +
" su.nick_name AS userName, " +
" su.image_url AS imageUrl, " +
- " e.happen_time as createAt, " +
+ " e.create_at as createAt, " +
" e.event_des, " +
+ " e.event_clazz, " +
" e.danger_level, " +
" e.urgent, " +
" e.major, " +
" e.happen_address, " +
" e.happent_lat_lng, " +
" e.event_type, " +
+ " e.event_category, " +
" e.id, " +
+ " egd.grid_name, " +
" e.event_deal_status " +
"FROM " +
" `event` AS e " +
@@ -827,4 +844,38 @@
" e.id = #{eventId}")
EventNewStatisticsVO getEventScreenEventDetail(@Param("eventId") Long eventId);
+ @Select("select process_date,process_result,process_type,from_type,from_id,from_name,event_id from event_transfer_record where event_id = #{eventId}")
+ List<EventTransferRecordVO> getEventScreenEventTransList(@Param("eventId") Long eventId);
+
+ @Select("SELECT " +
+ " cs.address AS streetName, " +
+ " ca.`name` AS communityName, " +
+ " egd.grid_name " +
+ "FROM " +
+ " `event` AS e " +
+ " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
+ " LEFT JOIN com_act AS ca ON egd.grid_community_id = ca.community_id " +
+ " LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id " +
+ "WHERE " +
+ " e.id = #{eventId}")
+ EventTransferRecordDetailVO getEventScreenEventTransDetail(@Param("eventId") Long eventId);
+
+ @Select("select ca.`name` AS communityName,cs.address AS streetName from com_act as ca LEFT JOIN com_street AS cs ON cs.street_id = ca.street_id where ca.community_id = #{communityId}")
+ EventTransferRecordDetailVO getEventScreenEventTransDetailByCommunityId(@Param("communityId") Long communityId);
+
+ @Select("select count(id) from com_elders_auth_elderly WHERE community_id = #{communityId}")
+ 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,cmp.sex from com_mng_population as cmp " +
+ " where cmp.act_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},'%') " +
+ " </if> " +
+ " </script>")
+ IPage<PopulationListVO> pagePopulationListApp(Page page, @Param("populationListDTO") PagePopulationListDTO populationListDTO);
+
}
--
Gitblit v1.7.1