java/zhihuishenqu.git

			@@ -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;
			@@ -126,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`, " +
			@@ -145,7 +148,6 @@
			"cmp.special_situation, " +
			"cmp.phone, " +
			"cmp.remark, " +
			"cmv.alley, " +
			"cmp.native_place, " +
			"cmp.nation, " +
			"cmp.label, " +
			@@ -160,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},'%') " +
			@@ -174,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 != ""'>" +
			@@ -192,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},'%') " +
			@@ -218,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" +
			@@ -1041,6 +1042,7 @@
			" cmp.card_no, " +
			" cmp.label, " +
			" cmp.address, " +
			" cmp.culture_level, " +
			" cmp.nation, " +
			" cmp.political_outlook, " +
			" cmp.sex, " +
			@@ -1088,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},'%') " +
			@@ -1243,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);

			}