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 | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 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 fa97328..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
@@ -69,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},'%') " +
@@ -124,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`, " +
@@ -143,7 +150,6 @@
"cmp.special_situation, " +
"cmp.phone, " +
"cmp.remark, " +
- "cmv.alley, " +
"cmp.native_place, " +
"cmp.nation, " +
"cmp.label, " +
@@ -158,7 +164,6 @@
"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},'%') " +
@@ -172,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 != ""'>" +
@@ -190,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},'%') " +
@@ -537,7 +542,6 @@
" LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id " +
" WHERE " +
" egd1.grid_community_id = #{screenEventDTO.communityId} " +
- " egd1.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 1 " +
" AND event_deal_status = 4 " +
@@ -558,7 +562,6 @@
" LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id " +
" WHERE " +
" egd2.grid_community_id = #{screenEventDTO.communityId} " +
- " egd2.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 5 " +
" AND event_status = 2 " +
@@ -579,7 +582,6 @@
" LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id " +
" WHERE " +
" egd3.grid_community_id = #{screenEventDTO.communityId} " +
- " egd3.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 5 " +
" AND event_deal_status = 4 " +
@@ -600,7 +602,6 @@
" LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id " +
" WHERE " +
" egd4.grid_community_id = #{screenEventDTO.communityId} " +
- " egd4.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 6 " +
" AND event_status = 2 " +
@@ -621,7 +622,6 @@
" LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id " +
" WHERE " +
" egd5.grid_community_id = #{screenEventDTO.communityId} " +
- " egd5.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 6 " +
" AND event_deal_status = 4 " +
@@ -642,7 +642,6 @@
" LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id " +
" WHERE " +
" egd6.grid_community_id = #{screenEventDTO.communityId} " +
- " egd6.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 3 " +
" AND event_status = 2 " +
@@ -663,7 +662,6 @@
" LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id " +
" WHERE " +
" egd7.grid_community_id = #{screenEventDTO.communityId} " +
- " egd7.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 3 " +
" AND event_deal_status = 4 " +
@@ -684,7 +682,6 @@
" LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id " +
" WHERE " +
" egd8.grid_community_id = #{screenEventDTO.communityId} " +
- " egd8.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 4 " +
" AND event_status = 2 " +
@@ -705,7 +702,6 @@
" LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id " +
" WHERE " +
" egd9.grid_community_id = #{screenEventDTO.communityId} " +
- " egd9.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 4 " +
" AND event_deal_status = 4 " +
@@ -726,7 +722,6 @@
" LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id " +
" WHERE " +
" egd10.grid_community_id = #{screenEventDTO.communityId} " +
- " egd10.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 2 " +
" AND event_status = 2 " +
@@ -747,7 +742,6 @@
" LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id " +
" WHERE " +
" egd11.grid_community_id = #{screenEventDTO.communityId} " +
- " egd11.grid_community_id = #{communityId} " +
" AND event_category = 1 " +
" AND event_type = 2 " +
" AND event_deal_status = 4 " +
@@ -776,8 +770,6 @@
" AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
" </if> " +
"), 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 = #{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 " +
"FROM " +
" `event` AS e " +
" LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
@@ -853,10 +845,16 @@
"<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 " +
- " AND egd.grid_community_id = #{communityId} " +
- " AND e.create_at >= DATE_SUB(CURDATE(),INTERVAL 30 DAY) UNION ALL " +
- "SELECT " +
" IFNULL( NULL, 7 ) AS type, " +
" id AS eventId, " +
" lng_lat AS latLng " +
@@ -870,6 +868,9 @@
"<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);
--
Gitblit v1.7.1