From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +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 | 267 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 212 insertions(+), 55 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 6129e4a..0cfe29a 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.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
@@ -68,10 +69,12 @@
"cmp.remark, " +
"cmv.alley, " +
"cmp.native_place, " +
+ "cmphu.relation, " +
"cmp.nation " +
"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_house_user AS cmphu ON cmphu.popul_id = cmp.id " +
"<where>" +
"<if test='comMngPopulationVO.name != null and comMngPopulationVO.name.trim() != ""'>" +
"AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " +
@@ -123,6 +126,11 @@
" where cmphu.house_id = #{houseId} and cmphu.popul_id != #{populId}")
List<ComHouseMemberVo> listHouseMermberByUserId(@Param("houseId") Long houseId, @Param("populId") Long populId);
+ @Select("SELECT cmphu.popul_id,cmphu.relation,cmp.NAME,cmp.phone,cmp.healthy,cmp.card_no,cmp.work_company,cmp.birthday FROM com_mng_population_house_user cmphu " +
+ " LEFT JOIN com_mng_population cmp ON cmphu.popul_id = cmp.id " +
+ " WHERE cmphu.popul_id = #{populId}")
+ List<ComHouseMemberVo> listHouseMermberByPopuId(@Param("populId") Long populId);
+
@Select("<script> " +
"SELECT " +
"cmp.`name`, " +
@@ -131,7 +139,6 @@
"cmp.act_id, " +
"cmp.village_id, " +
"cmp.sex, " +
- "cmp.age, " +
"cmp.card_no, " +
"cmp.road, " +
"cmp.door_no, " +
@@ -143,11 +150,9 @@
"cmp.special_situation, " +
"cmp.phone, " +
"cmp.remark, " +
- "cmv.alley, " +
"cmp.native_place, " +
"cmp.nation, " +
"cmp.label, " +
- "cmp.relation, " +
"cmp.marriage, " +
"cmp.culture_level, " +
"cmp.out_or_local, " +
@@ -155,13 +160,16 @@
"cmp.healthy, " +
"cmp.birthday, " +
"cmp.update_at, " +
+ "cmp.address, " +
"cmp.is_rent " +
"FROM " +
"com_mng_population AS cmp " +
- "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_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},'%') " +
" </if> " +
"<if test='comMngPopulationVO.actId != null'>" +
" and cmp.act_id = #{comMngPopulationVO.actId} " +
@@ -169,7 +177,7 @@
"<if test='comMngPopulationVO.outOrLocal != null'>" +
" and cmp.out_or_local = #{comMngPopulationVO.outOrLocal} " +
" </if> " +
- "<if test='comMngPopulationVO.villageId != null'>" +
+ "<if test='comMngPopulationVO.villageId != null and comMngPopulationVO.villageId != ""'>" +
" and cmp.village_id = #{comMngPopulationVO.villageId} " +
" </if> " +
"<if test='comMngPopulationVO.road != null and comMngPopulationVO.road != ""'>" +
@@ -187,17 +195,17 @@
"<if test='comMngPopulationVO.houseNo != null and comMngPopulationVO.houseNo != ""'>" +
"AND cmp.house_no = #{comMngPopulationVO.houseNo} " +
" </if> " +
- "<if test='comMngPopulationVO.alley != null and comMngPopulationVO.alley != ""'>" +
- "AND cmv.alley LIKE concat(#{comMngPopulationVO.alley},'%') " +
- " </if> " +
"<if test='comMngPopulationVO.sex != null and comMngPopulationVO.sex != ""'>" +
"AND cmp.sex = #{comMngPopulationVO.sex} " +
" </if> " +
- "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageStartTime != ""'>" +
+ "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageStartTime != "" and comMngPopulationVO.ageEndTime == null'>" +
"AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ <= ]]> #{comMngPopulationVO.ageStartTime} " +
" </if> " +
- "<if test='comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageEndTime != ""'>" +
+ "<if test='comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageEndTime != "" and comMngPopulationVO.ageStartTime == null'>" +
"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 BETWEEN #{comMngPopulationVO.ageStartTimeEnd} and #{comMngPopulationVO.ageEndTime}" +
" </if> " +
"<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != ""'>" +
"AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +
@@ -213,6 +221,9 @@
" </if> " +
"<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" +
@@ -235,6 +246,15 @@
"</script>")
IPage<InputUserInfoVO> specialInputUser(Page page, @Param("pageInputUserDTO") PageInputUserDTO pageInputUserDTO);
+ @Select("<script> " +
+ "select id,tag_name,community_id,create_at,sys_flag from com_mng_user_tag where community_id = #{comMngUserTagDTO.communityId}" +
+ "<if test='comMngUserTagDTO.tagName != null and comMngUserTagDTO.tagName != ""'>" +
+ " AND tag_name LIKE concat(#{comMngUserTagDTO.tagName},'%') " +
+ " </if> " +
+ " order by create_at desc " +
+ "</script>")
+ IPage<ComMngTagVO> specialInputUserTags(Page page, @Param("comMngUserTagDTO") PageInputUserDTO comMngUserTagDTO);
+
@Select("select user_id,card_photo_front,card_photo_back,family_book from sys_user where id_card=#{idCard}")
UserElectronicFileVO getSysUserElectronicFile(@Param("idCard") String idCard);
@@ -249,7 +269,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 " +
@@ -434,7 +454,8 @@
" label like concat('%',#{label},'%')")
Integer getSpecialStatisticsByLabel(@Param("label") String label);
- @Select("SELECT " +
+ @Select("<script> " +
+ "SELECT " +
" count( egd.id ) AS gridTotal, " +
" ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " +
" ( " +
@@ -446,6 +467,12 @@
" WHERE " +
" egd1.grid_community_id = egd.grid_community_id " +
" 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> " +
" ) AS eventTotal, " +
" ( " +
" SELECT " +
@@ -456,6 +483,12 @@
" WHERE " +
" egd2.grid_community_id = egd.grid_community_id " +
" AND event_status = 2 " +
+ "<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> " +
" AND event_deal_status IN ( 1, 2, 3 )) AS noSolveEventTotal, " +
" ( " +
" SELECT " +
@@ -467,12 +500,20 @@
" egd2.grid_community_id = egd.grid_community_id " +
" AND event_status = 2 " +
" 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> " +
" ) AS solveEventTotal " +
"FROM " +
" event_grid_data AS egd " +
"WHERE " +
- " egd.grid_community_id = #{communityId}")
- EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("communityId") Long communityId);
+ " egd.grid_community_id = #{screenEventDTO.communityId} " +
+ " </script>")
+ EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
@Select("SELECT " +
" DATE_FORMAT( e.create_at, '%m' ) months " +
@@ -490,7 +531,8 @@
" LIMIT 3")
List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);
- @Select("SELECT " +
+ @Select("<script> " +
+ "SELECT " +
" count( e.id ) AS eventZATotal, " +
" IFNULL(( " +
" SELECT " +
@@ -499,10 +541,16 @@
" `event` AS e1 " +
" LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id " +
" WHERE " +
- " egd1.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -513,10 +561,16 @@
" `event` AS e2 " +
" LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id " +
" WHERE " +
- " egd2.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -527,10 +581,16 @@
" `event` AS e3 " +
" LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id " +
" WHERE " +
- " egd3.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -541,10 +601,16 @@
" `event` AS e4 " +
" LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " +
" WHERE " +
- " egd4.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -555,10 +621,16 @@
" `event` AS e5 " +
" LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id " +
" WHERE " +
- " egd5.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -569,10 +641,16 @@
" `event` AS e6 " +
" LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id " +
" WHERE " +
- " egd6.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -583,10 +661,16 @@
" `event` AS e7 " +
" LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id " +
" WHERE " +
- " egd7.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -597,10 +681,16 @@
" `event` AS e8 " +
" LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id " +
" WHERE " +
- " egd8.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -611,10 +701,16 @@
" `event` AS e9 " +
" LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id " +
" WHERE " +
- " egd9.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -625,10 +721,16 @@
" `event` AS e10 " +
" LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id " +
" WHERE " +
- " egd10.grid_community_id = #{communityId} " +
+ " 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, " +
@@ -639,24 +741,50 @@
" `event` AS e11 " +
" LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id " +
" WHERE " +
- " egd11.grid_community_id = #{communityId} " +
+ " 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 = #{communityId} ), 0 ) AS eventSSPTotal, " +
- " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{communityId} ), 0 ) AS yesEventSSPTotal " +
+ " 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 handle_status = 2 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 = #{communityId} " +
- " AND event_category = 1 " +
- " AND event_type = 1 " +
- " AND event_status = 2")
- EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("communityId") Long communityId);
+ " 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>")
+ EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
@Select("SELECT " +
" su.nick_name AS userName, " +
@@ -698,7 +826,8 @@
" egd.grid_community_id = #{communityId}")
List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);
- @Select("SELECT " +
+ @Select("<script> " +
+ "SELECT " +
" event_type AS type, " +
" e.id AS eventId, " +
" happent_lat_lng AS latLng " +
@@ -709,22 +838,42 @@
" e.event_category = 1 " +
" AND e.event_type IN ( 1, 2, 3, 4, 5, 6 ) " +
" AND e.event_status = 2 " +
- " AND egd.grid_community_id = #{communityId} " +
- " AND e.happen_time BETWEEN date_add( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY ) " +
- " AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH ) UNION ALL " +
- "SELECT " +
+ " AND egd.grid_community_id = #{screenEventDTO.communityId} " +
+ "<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> " +
+ "<if test='screenEventDTO.eventProcessStatus != null'>" +
+ " AND e.event_process_status = #{screenEventDTO.eventProcessStatus} " +
+ " </if> " +
+ "<if test='screenEventDTO.redCard != null'>" +
+ " AND e.red_card = #{screenEventDTO.redCard} " +
+ " </if> " +
+ "<if test='screenEventDTO.yellowCard != null'>" +
+ " AND e.yellow_card = #{screenEventDTO.yellowCard} " +
+ " </if> " +
+ "UNION ALL SELECT " +
" IFNULL( NULL, 7 ) AS type, " +
" id AS eventId, " +
" lng_lat AS latLng " +
"FROM " +
" com_act_easy_photo " +
"WHERE " +
- " community_id = #{communityId} " +
- " AND del_tag = 0 " +
- " AND lng_lat IS NOT NULL " +
- " AND create_at BETWEEN date_add( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY ) " +
- " AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH )")
- List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("communityId") Long communityId);
+ " 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> " +
+ "<if test='screenEventDTO.eventProcessStatus != null'>" +
+ " AND handle_status = #{screenEventDTO.eventProcessStatus} " +
+ " </if> " +
+ " </script>")
+ List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);
+
@Select("SELECT " +
" count( id ) AS specialTotal, " +
@@ -734,7 +883,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, " +
@@ -760,7 +909,7 @@
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(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);
@Select(
@@ -777,7 +926,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," +
@@ -789,10 +938,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 " +
@@ -808,7 +957,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 " +
@@ -827,7 +976,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, " +
@@ -876,7 +1025,8 @@
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 " +
+ "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.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}" +
"<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != ""'>" +
"AND (cmp.`name` like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%')) " +
@@ -966,7 +1116,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);
@@ -994,8 +1144,14 @@
"<if test='populationDTO.keyWord != null'>" +
" AND (cmp.name like concat(#{populationDTO.keyWord},'%') or cmp.card_no_str like concat(#{populationDTO.keyWord},'%')) " +
" </if> " +
+ "<if test='populationDTO.populationIds != null and populationDTO.populationIds.size > 0'>" +
+ " AND cmp.id not in " +
+ "<foreach collection='populationDTO.populationIds' item='id' index='index' open='(' close=')' separator=',' >" +
+ "#{id}" +
+ "</foreach>" +
+ " </if> " +
" </script>")
- IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO);
+ IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page, @Param("populationDTO") PageComMngPopulationDTO populationDTO);
@Select("<script> " +
"SELECT " +
@@ -1088,6 +1244,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