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`, " +
			@@ -132,7 +139,6 @@
			"cmp.act_id, " +
			"cmp.village_id, " +
			"cmp.sex, " +
			"cmp.age, " +
			"cmp.card_no, " +
			"cmp.road, " +
			"cmp.door_no, " +
			@@ -144,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, " +
			@@ -156,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} " +
			@@ -170,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 != ""'>" +
			@@ -188,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},'%') " +
			@@ -214,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" +
			@@ -236,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);

			@@ -250,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 " +
			@@ -494,6 +513,7 @@
			" egd.grid_community_id = #{screenEventDTO.communityId} " +
			" </script>")
			EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);


			@Select("SELECT " +
			" DATE_FORMAT( e.create_at, '%m' ) months " +
			@@ -755,8 +775,6 @@
			" LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id " +
			"WHERE " +
			" egd.grid_community_id = #{screenEventDTO.communityId} " +
			" AND event_category = 1 " +
			" AND event_type = 1 " +
			" AND event_status = 2 " +
			"<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != ""'>" +
			" AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
			@@ -766,6 +784,7 @@
			" </if> " +
			" </script>")
			EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);


			@Select("SELECT " +
			" su.nick_name AS userName, " +
			@@ -826,6 +845,15 @@
			"<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, " +
			@@ -834,16 +862,18 @@
			" com_act_easy_photo " +
			"WHERE " +
			" community_id = #{screenEventDTO.communityId} " +
			" AND del_tag = 0 " +
			" AND lng_lat IS NOT NULL " +
			"<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, " +
			@@ -853,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, " +
			@@ -879,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(
			@@ -896,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," +
			@@ -908,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 " +
			@@ -927,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 " +
			@@ -946,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, " +
			@@ -1086,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);
			@@ -1121,7 +1151,7 @@
			"</foreach>" +
			" </if> " +
			" </script>")
			IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO);
			IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page, @Param("populationDTO") PageComMngPopulationDTO populationDTO);

			@Select("<script> " +
			"SELECT " +
			@@ -1214,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);

			}