From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 31 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..a720a6b 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;
@@ -69,10 +67,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 +124,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 +148,6 @@
"cmp.special_situation, " +
"cmp.phone, " +
"cmp.remark, " +
- "cmv.alley, " +
"cmp.native_place, " +
"cmp.nation, " +
"cmp.label, " +
@@ -158,7 +162,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 +175,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 +193,20 @@
"<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.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},'%') " +
@@ -216,9 +222,6 @@
" </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" +
@@ -537,7 +540,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 +560,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 +580,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 +600,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 +620,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 +640,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 +660,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 +680,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 +700,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 +720,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 +740,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 +768,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 +843,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 " +
@@ -869,6 +865,9 @@
" </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);
@@ -1043,6 +1042,7 @@
" cmp.card_no, " +
" cmp.label, " +
" cmp.address, " +
+ " cmp.culture_level, " +
" cmp.nation, " +
" cmp.political_outlook, " +
" cmp.sex, " +
@@ -1090,7 +1090,7 @@
" FROM " +
" com_mng_population AS cmp 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},'%') " +
@@ -1245,5 +1245,32 @@
" </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