java/zhihuishenqu.git

			@@ -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,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 +224,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" +
			@@ -840,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 = #{screenEventDTO.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 " +
			@@ -856,6 +867,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);
			@@ -1030,6 +1044,7 @@
			" cmp.card_no, " +
			" cmp.label, " +
			" cmp.address, " +
			" cmp.culture_level, " +
			" cmp.nation, " +
			" cmp.political_outlook, " +
			" cmp.sex, " +
			@@ -1077,7 +1092,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},'%') " +