以房找人逻辑修改

bug修改--renpc

src/main/java/com/cm/population/controller/api/population/PopulationController.java

@@ -138,7 +138,7 @@ public class PopulationController extends AbstractController {
     @ApiOperation(value = "以房找人", notes = "以房找人接口")
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("findPopulation")
-    public SuccessResultList<List<HouseUserDTO>> findPopulation(ListPage page) {
+    public SuccessResultList<List<PopulationDTO>> findPopulation(ListPage page) {
         Map<String, Object> params = requestParams();
         page.setParams(params);
         return populationService.findPopulation(page);

src/main/java/com/cm/population/dao/house/IHouseDao.java

@@ -6,6 +6,7 @@ import com.cm.common.exception.SearchException;
 import com.cm.common.exception.UpdateException;
 import com.cm.population.pojo.bos.house.HouseBO;
 import com.cm.population.pojo.dtos.house.HouseDTO;
+import com.cm.population.pojo.dtos.population.PopulationDTO;
 import com.cm.population.pojo.pos.house.HousePO;
 import org.springframework.stereotype.Repository;
 
@@ -117,4 +118,10 @@ public interface IHouseDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    /**
+     * 以房找人
+     * @param params
+     * @return
+     */
+    List<PopulationDTO> findPopulation(Map<String, Object> params);
 }

src/main/java/com/cm/population/pojo/dtos/population/PopulationDTO.java

@@ -42,6 +42,8 @@ public class PopulationDTO {
     private Integer isDelete;
     @ApiModelProperty(name = "houseDTO", value = "房屋详情")
     private HouseDTO houseDTO;
+    @ApiModelProperty(name = "populationInfoHouseDTO", value = "人口详情")
+    private PopulationInfoHouseDTO populationInfoHouseDTO;
     @ApiModelProperty(name = "populationInfoDTO", value = "人口详情")
     private PopulationInfoDTO populationInfoDTO;
 
@@ -149,6 +151,14 @@ public class PopulationDTO {
         this.houseDTO = houseDTO;
     }
 
+    public PopulationInfoHouseDTO getPopulationInfoHouseDTO() {
+        return populationInfoHouseDTO;
+    }
+
+    public void setPopulationInfoHouseDTO(PopulationInfoHouseDTO populationInfoHouseDTO) {
+        this.populationInfoHouseDTO = populationInfoHouseDTO;
+    }
+
     public PopulationInfoDTO getPopulationInfoDTO() {
         return populationInfoDTO;
     }

src/main/java/com/cm/population/pojo/dtos/population/PopulationInfoHouseDTO.java

@@ -0,0 +1,771 @@
+package com.cm.population.pojo.dtos.population;
+
+import com.cm.common.annotation.CheckEmptyAnnotation;
+import com.cm.population.pojo.dtos.populationinfo.PopulationInfoBaseDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ *
+ * @ClassName: PopulationInfoDTO
+ * @Description: 基础人口信息
+ * @Author: CodeFactory
+ * @Date: 2023-10-24 11:55:46
+ * @Version: 3.0
+ **/
+@ApiModel
+public class PopulationInfoHouseDTO {
+
+    @ApiModelProperty(name = "populationInfoId", value = "人口ID")
+    private String populationInfoId;
+    @ApiModelProperty(name = "name", value = "姓名")
+    private String name;
+    @ApiModelProperty(name = "idcard", value = "证件")
+    private String idcard;
+    @ApiModelProperty(name = "idcardType", value = "证件类型")
+    private String idcardType;
+    @ApiModelProperty(name = "birthday", value = "生日")
+    private String birthday;
+    @ApiModelProperty(name = "sex", value = "性别")
+    private String sex;
+    @ApiModelProperty(name = "nation", value = "民族")
+    private String nation;
+    @ApiModelProperty(name = "education", value = "文化程度")
+    private String education;
+    @ApiModelProperty(name = "description", value = "就读院校及专业(需注明学历)")
+    private String description;
+    @ApiModelProperty(name = "organization", value = "所属党派")
+    private String organization;
+    @ApiModelProperty(name = "religion", value = "宗教信仰")
+    private String religion;
+    @ApiModelProperty(name = "marriageStatus", value = "婚姻状况")
+    private String marriageStatus;
+    @ApiModelProperty(name = "marriageChangeTime", value = "婚变日期")
+    private String marriageChangeTime;
+    @ApiModelProperty(name = "marriageFirstTime", value = "初婚日期")
+    private String marriageFirstTime;
+    @ApiModelProperty(name = "socialSecurity", value = "社会保险情况")
+    private String socialSecurity;
+    @ApiModelProperty(name = "healthStatus", value = "健康状况")
+    private String healthStatus;
+    @ApiModelProperty(name = "department", value = "工作单位")
+    private String department;
+    @ApiModelProperty(name = "pastion", value = "工作职务")
+    private String pastion;
+    @ApiModelProperty(name = "pastionTitle", value = "专业技术职称")
+    private String pastionTitle;
+    @ApiModelProperty(name = "expertise", value = "专长")
+    private String expertise;
+    @ApiModelProperty(name = "phone", value = "联系电话")
+    private String phone;
+    @ApiModelProperty(name = "fatherId", value = "父亲ID")
+    private String fatherId;
+    @ApiModelProperty(name = "fatherName", value = "父亲姓名")
+    private String fatherName;
+    @ApiModelProperty(name = "fatherIdcard", value = "父亲证件")
+    private String fatherIdcard;
+    @ApiModelProperty(name = "fatherPhone", value = "父亲电话")
+    private String fatherPhone;
+    @ApiModelProperty(name = "motherId", value = "母亲ID")
+    private String motherId;
+    @ApiModelProperty(name = "motherName", value = "母亲姓名")
+    private String motherName;
+    @ApiModelProperty(name = "motherIdcard", value = "母亲证件")
+    private String motherIdcard;
+    @ApiModelProperty(name = "motherPhone", value = "母亲电话")
+    private String motherPhone;
+    @ApiModelProperty(name = "relationship", value = "与户主关系")
+    private String relationship;
+    @ApiModelProperty(name = "domicileAddress", value = "户籍详细地址")
+    private String domicileAddress;
+    @ApiModelProperty(name = "domicileAddressType", value = "户籍类型1非包头市,2是包头市非高新区,3是高新区")
+    private String domicileAddressType;
+    @ApiModelProperty(name = "domicileAreaCode", value = "户籍地址字典编码")
+    @CheckEmptyAnnotation(name = "户籍地址")
+    private String domicileAreaCode;
+    @ApiModelProperty(name = "domicileAreaName", value = "户籍地址字典名称(/隔开)")
+    private String domicileAreaName;
+    @ApiModelProperty(name = "originAddress", value = "籍贯详细地址")
+    private String originAddress;
+    @ApiModelProperty(name = "originAreaCode", value = "籍贯地址字典编码")
+    private String originAreaCode;
+    @ApiModelProperty(name = "originAreaName", value = "籍贯地址字典名称(/隔开)")
+    private String originAreaName;
+    @ApiModelProperty(name = "flowTime", value = "流动日期")
+    private String flowTime;
+    @ApiModelProperty(name = "flowReason", value = "流动原因")
+    private String flowReason;
+    @ApiModelProperty(name = "flowReasontext", value = "其他流动原因")
+    private String flowReasontext;
+    @ApiModelProperty(name = "isOldage", value = "是否为老年人(是或否)")
+    private String isOldage;
+    @ApiModelProperty(name = "oldageType", value = "老人类别")
+    private String oldageType;
+    @ApiModelProperty(name = "oldageDepartment", value = "离退休前单位")
+    private String oldageDepartment;
+    @ApiModelProperty(name = "oldageLift", value = "生活照料情况")
+    private String oldageLift;
+    @ApiModelProperty(name = "oldageHealthStatus", value = "健康状况")
+    private String oldageHealthStatus;
+    @ApiModelProperty(name = "oldageSelfcare", value = "生活自理能力")
+    private String oldageSelfcare;
+    @ApiModelProperty(name = "oldageLive", value = "居住状况")
+    private String oldageLive;
+    @ApiModelProperty(name = "isDisability", value = "是否为残疾人(是或否)")
+    private String isDisability;
+    @ApiModelProperty(name = "disabilityType", value = "残疾类别")
+    private String disabilityType;
+    @ApiModelProperty(name = "disabilityLevel", value = "残疾等级")
+    private String disabilityLevel;
+    @ApiModelProperty(name = "disabilityNumber", value = "残疾证号")
+    private String disabilityNumber;
+    @ApiModelProperty(name = "disabilityCarnumber", value = "残疾车牌号")
+    private String disabilityCarnumber;
+    @ApiModelProperty(name = "disabilityAddress", value = "居住详细地址")
+    private String disabilityAddress;
+    @ApiModelProperty(name = "disabilityAreaCode", value = "居住地址字典编码")
+    private String disabilityAreaCode;
+    @ApiModelProperty(name = "disabilityAreaName", value = "居住地址字典名称(/隔开)")
+    private String disabilityAreaName;
+    @ApiModelProperty(name = "disabilityIncome", value = "收入情况")
+    private String disabilityIncome;
+    @ApiModelProperty(name = "disabilityHouse", value = "住房来源")
+    private String disabilityHouse;
+    @ApiModelProperty(name = "disabilityTime", value = "办证时间")
+    private String disabilityTime;
+    @ApiModelProperty(name = "disabilityGuardian", value = "监护人或配偶姓名")
+    private String disabilityGuardian;
+    @ApiModelProperty(name = "disabilityGuardianPhone", value = "监护人联系电话")
+    private String disabilityGuardianPhone;
+    @ApiModelProperty(name = "disabilityGuardianRelation", value = "监护人关系")
+    private String disabilityGuardianRelation;
+    @ApiModelProperty(name = "isMilitary", value = "是否为军人(是或否)")
+    private String isMilitary;
+    @ApiModelProperty(name = "militaryTime", value = "批准退出现役日期")
+    private String militaryTime;
+    @ApiModelProperty(name = "militaryPosition", value = "退出现役时职级")
+    private String militaryPosition;
+    @ApiModelProperty(name = "isSuccour", value = "是否为社会救助(是或否)")
+    private String isSuccour;
+    @ApiModelProperty(name = "succourDibao", value = "低保户")
+    private String succourDibao;
+    @ApiModelProperty(name = "succourHelp", value = "医疗救助")
+    private String succourHelp;
+    @ApiModelProperty(name = "succourDifficulty", value = "困难职工")
+    private String succourDifficulty;
+    @ApiModelProperty(name = "succourSubsidy", value = "老龄补贴")
+    private String succourSubsidy;
+    @ApiModelProperty(name = "isParty", value = "是否为党员(是或否)")
+    private String isParty;
+    @ApiModelProperty(name = "partyOrganization", value = "党组织名称")
+    private String partyOrganization;
+    @ApiModelProperty(name = "partyTime", value = "入党时间")
+    private String partyTime;
+    @ApiModelProperty(name = "othertext", value = "其他说明")
+    private String othertext;
+    @ApiModelProperty(name = "departmentType", value = "就业类型")
+    @CheckEmptyAnnotation(name = "就业状态")
+    private String departmentType;
+    @ApiModelProperty(name = "populationInfoBaseDTO", value = "人员基本信息")
+    private PopulationInfoBaseDTO populationInfoBaseDTO;
+
+    public String getDepartmentType() {
+        return departmentType == null ? "" : departmentType;
+    }
+
+    public void setDepartmentType(String departmentType) {
+        this.departmentType = departmentType;
+    }
+
+    public String getDomicileAddressType() {
+        return domicileAddressType == null ? "" : domicileAddressType;
+    }
+
+    public void setDomicileAddressType(String domicileAddressType) {
+        this.domicileAddressType = domicileAddressType;
+    }
+
+    public String getDomicileAreaCode() {
+        return domicileAreaCode == null ? "" :  domicileAreaCode;
+    }
+
+    public void setDomicileAreaCode(String domicileAreaCode) {
+        this.domicileAreaCode = domicileAreaCode;
+    }
+
+    public String getDomicileAreaName() {
+        return domicileAreaName == null ? "" :  domicileAreaName;
+    }
+
+    public void setDomicileAreaName(String domicileAreaName) {
+        this.domicileAreaName = domicileAreaName;
+    }
+
+    public String getOriginAreaCode() {
+        return originAreaCode == null ? "" :  originAreaCode;
+    }
+
+    public void setOriginAreaCode(String originAreaCode) {
+        this.originAreaCode = originAreaCode;
+    }
+
+    public String getOriginAreaName() {
+        return originAreaName == null ? "" :  originAreaName;
+    }
+
+    public void setOriginAreaName(String originAreaName) {
+        this.originAreaName = originAreaName;
+    }
+
+    public String getDisabilityAreaCode() {
+        return disabilityAreaCode == null ? "" :  disabilityAreaCode;
+    }
+
+    public void setDisabilityAreaCode(String disabilityAreaCode) {
+        this.disabilityAreaCode = disabilityAreaCode;
+    }
+
+    public String getDisabilityAreaName() {
+        return disabilityAreaName == null ? "" :  disabilityAreaName;
+    }
+
+    public void setDisabilityAreaName(String disabilityAreaName) {
+        this.disabilityAreaName = disabilityAreaName;
+    }
+
+    public String getPopulationInfoId() {
+        return populationInfoId == null ? "" : populationInfoId.trim();
+    }
+
+    public void setPopulationInfoId(String populationInfoId) {
+        this.populationInfoId = populationInfoId;
+    }
+
+    public String getName() {
+        return name == null ? "" : name.trim();
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIdcard() {
+        return idcard == null ? "" : idcard.trim();
+    }
+
+    public void setIdcard(String idcard) {
+        this.idcard = idcard;
+    }
+
+    public String getIdcardType() {
+        return idcardType == null ? "" : idcardType.trim();
+    }
+
+    public void setIdcardType(String idcardType) {
+        this.idcardType = idcardType;
+    }
+
+    public String getBirthday() {
+        return birthday == null ? "" : birthday.trim();
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public String getSex() {
+        return sex == null ? "" : sex.trim();
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getNation() {
+        return nation == null ? "" : nation.trim();
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getEducation() {
+        return education == null ? "" : education.trim();
+    }
+
+    public void setEducation(String education) {
+        this.education = education;
+    }
+
+    public String getDescription() {
+        return description == null ? "" : description.trim();
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getOrganization() {
+        return organization == null ? "" : organization.trim();
+    }
+
+    public void setOrganization(String organization) {
+        this.organization = organization;
+    }
+
+    public String getReligion() {
+        return religion == null ? "" : religion.trim();
+    }
+
+    public void setReligion(String religion) {
+        this.religion = religion;
+    }
+
+    public String getMarriageStatus() {
+        return marriageStatus == null ? "" : marriageStatus.trim();
+    }
+
+    public void setMarriageStatus(String marriageStatus) {
+        this.marriageStatus = marriageStatus;
+    }
+
+    public String getMarriageChangeTime() {
+        return marriageChangeTime == null ? "" : marriageChangeTime.trim();
+    }
+
+    public void setMarriageChangeTime(String marriageChangeTime) {
+        this.marriageChangeTime = marriageChangeTime;
+    }
+
+    public String getMarriageFirstTime() {
+        return marriageFirstTime == null ? "" : marriageFirstTime.trim();
+    }
+
+    public void setMarriageFirstTime(String marriageFirstTime) {
+        this.marriageFirstTime = marriageFirstTime;
+    }
+
+    public String getSocialSecurity() {
+        return socialSecurity == null ? "" : socialSecurity.trim();
+    }
+
+    public void setSocialSecurity(String socialSecurity) {
+        this.socialSecurity = socialSecurity;
+    }
+
+    public String getHealthStatus() {
+        return healthStatus == null ? "" : healthStatus.trim();
+    }
+
+    public void setHealthStatus(String healthStatus) {
+        this.healthStatus = healthStatus;
+    }
+
+    public String getDepartment() {
+        return department == null ? "" : department.trim();
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getPastion() {
+        return pastion == null ? "" : pastion.trim();
+    }
+
+    public void setPastion(String pastion) {
+        this.pastion = pastion;
+    }
+
+    public String getPastionTitle() {
+        return pastionTitle == null ? "" : pastionTitle.trim();
+    }
+
+    public void setPastionTitle(String pastionTitle) {
+        this.pastionTitle = pastionTitle;
+    }
+
+    public String getExpertise() {
+        return expertise == null ? "" : expertise.trim();
+    }
+
+    public void setExpertise(String expertise) {
+        this.expertise = expertise;
+    }
+
+    public String getPhone() {
+        return phone == null ? "" : phone.trim();
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getFatherId() {
+        return fatherId == null ? "" : fatherId.trim();
+    }
+
+    public void setFatherId(String fatherId) {
+        this.fatherId = fatherId;
+    }
+
+    public String getFatherName() {
+        return fatherName == null ? "" : fatherName.trim();
+    }
+
+    public void setFatherName(String fatherName) {
+        this.fatherName = fatherName;
+    }
+
+    public String getFatherIdcard() {
+        return fatherIdcard == null ? "" : fatherIdcard.trim();
+    }
+
+    public void setFatherIdcard(String fatherIdcard) {
+        this.fatherIdcard = fatherIdcard;
+    }
+
+    public String getFatherPhone() {
+        return fatherPhone == null ? "" : fatherPhone.trim();
+    }
+
+    public void setFatherPhone(String fatherPhone) {
+        this.fatherPhone = fatherPhone;
+    }
+
+    public String getMotherId() {
+        return motherId == null ? "" : motherId.trim();
+    }
+
+    public void setMotherId(String motherId) {
+        this.motherId = motherId;
+    }
+
+    public String getMotherName() {
+        return motherName == null ? "" : motherName.trim();
+    }
+
+    public void setMotherName(String motherName) {
+        this.motherName = motherName;
+    }
+
+    public String getMotherIdcard() {
+        return motherIdcard == null ? "" : motherIdcard.trim();
+    }
+
+    public void setMotherIdcard(String motherIdcard) {
+        this.motherIdcard = motherIdcard;
+    }
+
+    public String getMotherPhone() {
+        return motherPhone == null ? "" : motherPhone.trim();
+    }
+
+    public void setMotherPhone(String motherPhone) {
+        this.motherPhone = motherPhone;
+    }
+
+    public String getRelationship() {
+        return relationship == null ? "" : relationship.trim();
+    }
+
+    public void setRelationship(String relationship) {
+        this.relationship = relationship;
+    }
+
+    public String getDomicileAddress() {
+        return domicileAddress == null ? "" : domicileAddress.trim();
+    }
+
+    public void setDomicileAddress(String domicileAddress) {
+        this.domicileAddress = domicileAddress;
+    }
+
+    public String getOriginAddress() {
+        return originAddress == null ? "" : originAddress.trim();
+    }
+
+    public void setOriginAddress(String originAddress) {
+        this.originAddress = originAddress;
+    }
+
+    public String getFlowTime() {
+        return flowTime == null ? "" : flowTime.trim();
+    }
+
+    public void setFlowTime(String flowTime) {
+        this.flowTime = flowTime;
+    }
+
+    public String getFlowReason() {
+        return flowReason == null ? "" : flowReason.trim();
+    }
+
+    public void setFlowReason(String flowReason) {
+        this.flowReason = flowReason;
+    }
+
+    public String getFlowReasontext() {
+        return flowReasontext == null ? "" : flowReasontext.trim();
+    }
+
+    public void setFlowReasontext(String flowReasontext) {
+        this.flowReasontext = flowReasontext;
+    }
+
+    public String getIsOldage() {
+        return isOldage == null ? "" : isOldage.trim();
+    }
+
+    public void setIsOldage(String isOldage) {
+        this.isOldage = isOldage;
+    }
+
+    public String getOldageType() {
+        return oldageType == null ? "" : oldageType.trim();
+    }
+
+    public void setOldageType(String oldageType) {
+        this.oldageType = oldageType;
+    }
+
+    public String getOldageDepartment() {
+        return oldageDepartment == null ? "" : oldageDepartment.trim();
+    }
+
+    public void setOldageDepartment(String oldageDepartment) {
+        this.oldageDepartment = oldageDepartment;
+    }
+
+    public String getOldageLift() {
+        return oldageLift == null ? "" : oldageLift.trim();
+    }
+
+    public void setOldageLift(String oldageLift) {
+        this.oldageLift = oldageLift;
+    }
+
+    public String getOldageHealthStatus() {
+        return oldageHealthStatus == null ? "" : oldageHealthStatus.trim();
+    }
+
+    public void setOldageHealthStatus(String oldageHealthStatus) {
+        this.oldageHealthStatus = oldageHealthStatus;
+    }
+
+    public String getOldageSelfcare() {
+        return oldageSelfcare == null ? "" : oldageSelfcare.trim();
+    }
+
+    public void setOldageSelfcare(String oldageSelfcare) {
+        this.oldageSelfcare = oldageSelfcare;
+    }
+
+    public String getOldageLive() {
+        return oldageLive == null ? "" : oldageLive.trim();
+    }
+
+    public void setOldageLive(String oldageLive) {
+        this.oldageLive = oldageLive;
+    }
+
+    public String getIsDisability() {
+        return isDisability == null ? "" : isDisability.trim();
+    }
+
+    public void setIsDisability(String isDisability) {
+        this.isDisability = isDisability;
+    }
+
+    public String getDisabilityType() {
+        return disabilityType == null ? "" : disabilityType.trim();
+    }
+
+    public void setDisabilityType(String disabilityType) {
+        this.disabilityType = disabilityType;
+    }
+
+    public String getDisabilityLevel() {
+        return disabilityLevel == null ? "" : disabilityLevel.trim();
+    }
+
+    public void setDisabilityLevel(String disabilityLevel) {
+        this.disabilityLevel = disabilityLevel;
+    }
+
+    public String getDisabilityNumber() {
+        return disabilityNumber == null ? "" : disabilityNumber.trim();
+    }
+
+    public void setDisabilityNumber(String disabilityNumber) {
+        this.disabilityNumber = disabilityNumber;
+    }
+
+    public String getDisabilityCarnumber() {
+        return disabilityCarnumber == null ? "" : disabilityCarnumber.trim();
+    }
+
+    public void setDisabilityCarnumber(String disabilityCarnumber) {
+        this.disabilityCarnumber = disabilityCarnumber;
+    }
+
+    public String getDisabilityAddress() {
+        return disabilityAddress == null ? "" : disabilityAddress.trim();
+    }
+
+    public void setDisabilityAddress(String disabilityAddress) {
+        this.disabilityAddress = disabilityAddress;
+    }
+
+    public String getDisabilityIncome() {
+        return disabilityIncome == null ? "" : disabilityIncome.trim();
+    }
+
+    public void setDisabilityIncome(String disabilityIncome) {
+        this.disabilityIncome = disabilityIncome;
+    }
+
+    public String getDisabilityHouse() {
+        return disabilityHouse == null ? "" : disabilityHouse.trim();
+    }
+
+    public void setDisabilityHouse(String disabilityHouse) {
+        this.disabilityHouse = disabilityHouse;
+    }
+
+    public String getDisabilityTime() {
+        return disabilityTime == null ? "" : disabilityTime.trim();
+    }
+
+    public void setDisabilityTime(String disabilityTime) {
+        this.disabilityTime = disabilityTime;
+    }
+
+    public String getDisabilityGuardian() {
+        return disabilityGuardian == null ? "" : disabilityGuardian.trim();
+    }
+
+    public void setDisabilityGuardian(String disabilityGuardian) {
+        this.disabilityGuardian = disabilityGuardian;
+    }
+
+    public String getDisabilityGuardianPhone() {
+        return disabilityGuardianPhone == null ? "" : disabilityGuardianPhone.trim();
+    }
+
+    public void setDisabilityGuardianPhone(String disabilityGuardianPhone) {
+        this.disabilityGuardianPhone = disabilityGuardianPhone;
+    }
+
+    public String getDisabilityGuardianRelation() {
+        return disabilityGuardianRelation == null ? "" : disabilityGuardianRelation.trim();
+    }
+
+    public void setDisabilityGuardianRelation(String disabilityGuardianRelation) {
+        this.disabilityGuardianRelation = disabilityGuardianRelation;
+    }
+
+    public String getIsMilitary() {
+        return isMilitary == null ? "" : isMilitary.trim();
+    }
+
+    public void setIsMilitary(String isMilitary) {
+        this.isMilitary = isMilitary;
+    }
+
+    public String getMilitaryTime() {
+        return militaryTime == null ? "" : militaryTime.trim();
+    }
+
+    public void setMilitaryTime(String militaryTime) {
+        this.militaryTime = militaryTime;
+    }
+
+    public String getMilitaryPosition() {
+        return militaryPosition == null ? "" : militaryPosition.trim();
+    }
+
+    public void setMilitaryPosition(String militaryPosition) {
+        this.militaryPosition = militaryPosition;
+    }
+
+    public String getIsSuccour() {
+        return isSuccour == null ? "" : isSuccour.trim();
+    }
+
+    public void setIsSuccour(String isSuccour) {
+        this.isSuccour = isSuccour;
+    }
+
+    public String getSuccourDibao() {
+        return succourDibao == null ? "" : succourDibao.trim();
+    }
+
+    public void setSuccourDibao(String succourDibao) {
+        this.succourDibao = succourDibao;
+    }
+
+    public String getSuccourHelp() {
+        return succourHelp == null ? "" : succourHelp.trim();
+    }
+
+    public void setSuccourHelp(String succourHelp) {
+        this.succourHelp = succourHelp;
+    }
+
+    public String getSuccourDifficulty() {
+        return succourDifficulty == null ? "" : succourDifficulty.trim();
+    }
+
+    public void setSuccourDifficulty(String succourDifficulty) {
+        this.succourDifficulty = succourDifficulty;
+    }
+
+    public String getSuccourSubsidy() {
+        return succourSubsidy == null ? "" : succourSubsidy.trim();
+    }
+
+    public void setSuccourSubsidy(String succourSubsidy) {
+        this.succourSubsidy = succourSubsidy;
+    }
+
+    public String getIsParty() {
+        return isParty == null ? "" : isParty.trim();
+    }
+
+    public void setIsParty(String isParty) {
+        this.isParty = isParty;
+    }
+
+    public String getPartyOrganization() {
+        return partyOrganization == null ? "" : partyOrganization.trim();
+    }
+
+    public void setPartyOrganization(String partyOrganization) {
+        this.partyOrganization = partyOrganization;
+    }
+
+    public String getPartyTime() {
+        return partyTime == null ? "" : partyTime.trim();
+    }
+
+    public void setPartyTime(String partyTime) {
+        this.partyTime = partyTime;
+    }
+
+    public String getOthertext() {
+        return othertext == null ? "" : othertext.trim();
+    }
+
+    public void setOthertext(String othertext) {
+        this.othertext = othertext;
+    }
+
+    public PopulationInfoBaseDTO getPopulationInfoBaseDTO() {
+        return populationInfoBaseDTO;
+    }
+
+    public void setPopulationInfoBaseDTO(PopulationInfoBaseDTO populationInfoBaseDTO) {
+        this.populationInfoBaseDTO = populationInfoBaseDTO;
+    }
+}

src/main/java/com/cm/population/service/population/IPopulationService.java

@@ -201,5 +201,5 @@ public interface IPopulationService {
      * @param page
      * @return
      */
-    SuccessResultList<List<HouseUserDTO>> findPopulation(ListPage page);
+    SuccessResultList<List<PopulationDTO>> findPopulation(ListPage pag);
 }

src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java

@@ -5,11 +5,13 @@ import com.cm.common.pojo.ListPage;
 import com.cm.common.result.SuccessResultList;
 import com.cm.common.utils.HashMapUtil;
 import com.cm.common.utils.UUIDUtil;
+import com.cm.population.dao.house.IHouseDao;
 import com.cm.population.dao.population.IPopulationDao;
 import com.cm.population.pojo.bos.population.PopulationBO;
 import com.cm.population.pojo.dtos.house.HouseDTO;
 import com.cm.population.pojo.dtos.population.HouseUserDTO;
 import com.cm.population.pojo.dtos.population.PopulationDTO;
+import com.cm.population.pojo.dtos.population.PopulationInfoHouseDTO;
 import com.cm.population.pojo.dtos.populationinfo.PopulationInfoBaseDTO;
 import com.cm.population.pojo.dtos.populationinfo.PopulationInfoDTO;
 import com.cm.population.pojo.pos.population.PopulationPO;
@@ -40,6 +42,8 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
     @Autowired
     private IPopulationDao populationDao;
     @Autowired
+    private IHouseDao houseDao;
+    @Autowired
     private IHouseService houseService;
     @Autowired
     private IPopulationInfoService populationInfoService;
@@ -247,42 +251,31 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
     }
 
     @Override
-    public SuccessResultList<List<HouseUserDTO>> findPopulation(ListPage page) {
+    public SuccessResultList<List<PopulationDTO>> findPopulation(ListPage page) {
         PageHelper.startPage(page.getPage(), page.getRows());
-        List<PopulationDTO> overList = new ArrayList<>();
-        Map<String, Object> params = page.getParams();
-        List<HouseDTO> houseDTOList = houseService.list(page.getParams());
-        if(null != houseDTOList) {
-            for (HouseDTO houseDTO : houseDTOList) {
-                params.put("keywords", houseDTO.getHouseId());
-                List<PopulationDTO> populationDTOList = list(params);
-                if(null != populationDTOList) {
-                    overList.addAll(populationDTOList);
-                }
-            }
-        }
+        List<PopulationDTO> overList = houseDao.findPopulation(page.getParams());
 
-        List<HouseUserDTO> houseUserDTOList = new ArrayList<>();
         // 获取人口详情
         for (PopulationDTO populationDTO : overList) {
             PopulationInfoDTO populationInfoDTO = populationInfoService.get(populationDTO.getPopulationInfoId());
-            HouseUserDTO houseUserDTO = new HouseUserDTO();
-            BeanUtils.copyProperties(populationInfoDTO, houseUserDTO);
+            PopulationInfoHouseDTO populationInfoHouseDTO = new PopulationInfoHouseDTO();
+            BeanUtils.copyProperties(populationInfoDTO, populationInfoHouseDTO);
 
             // 获取人员
             PopulationInfoBaseDTO base = populationInfoService.getBase(populationDTO.getPopulationInfoId());
-            houseUserDTO.setPopulationInfoBaseDTO(base);
+            populationInfoHouseDTO.setPopulationInfoBaseDTO(base);
+
+            populationDTO.setPopulationInfoHouseDTO(populationInfoHouseDTO);
 
             // 获取房屋详情
             HouseDTO houseDTO = houseService.get(populationDTO.getHouseId());
             if(null != houseDTO) {
-                houseUserDTO.setHouseDTO(houseDTO);
+                populationDTO.setHouseDTO(houseDTO);
             }
-            houseUserDTOList.add(houseUserDTO);
         }
 
-        PageInfo<HouseUserDTO> pageInfo = new PageInfo<>(houseUserDTOList);
-        return new SuccessResultList<>(houseUserDTOList, pageInfo.getPageNum(), pageInfo.getTotal());
+        PageInfo<PopulationDTO> pageInfo = new PageInfo<>(overList);
+        return new SuccessResultList<>(overList, pageInfo.getPageNum(), pageInfo.getTotal());
     }
 
 }

src/main/resources/mybatis/mapper/house/house-mapper.xml

@@ -169,6 +169,21 @@
         <result column="street_name" property="streetName"/>
     </resultMap>
 
+    <resultMap id="populationDTO" type="com.cm.population.pojo.dtos.population.PopulationDTO">
+        <result column="population_id" property="populationId"/>
+        <result column="house_id" property="houseId"/>
+        <result column="population_info_id" property="populationInfoId"/>
+        <result column="name" property="name"/>
+        <result column="card_num" property="cardNum"/>
+        <result column="bind_time" property="bindTime"/>
+        <result column="phone" property="phone"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="modifier" property="modifier"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="is_delete" property="isDelete"/>
+    </resultMap>
+
     <!-- 新增房院管理 -->
     <insert id="save" parameterType="map">
         INSERT INTO house_house(
@@ -706,45 +721,44 @@
             house_house t1
         WHERE
             t1.is_delete = 0
-
         <if test="street != null and street != ''">
-            AND street = #{street},
+            AND street = #{street}
         </if>
         <if test="streetName != null and streetName != ''">
-            AND street_name = #{streetName},
+            AND street_name = #{streetName}
         </if>
         <if test="community != null and community != ''">
-            AND community = #{community},
+            AND community = #{community}
         </if>
         <if test="communityName != null and communityName != ''">
-            AND community_name = #{communityName},
+            AND community_name = #{communityName}
         </if>
         <if test="residentialId != null and residentialId != ''">
-            AND residential_id = #{residentialId},
+            AND residential_id = #{residentialId}
         </if>
         <if test="residentialName != null and residentialName != ''">
-            AND residential_name = #{residentialName},
+            AND residential_name = #{residentialName}
         </if>
         <if test="buildingId != null and buildingId != ''">
-            AND building_id = #{buildingId},
+            AND building_id = #{buildingId}
         </if>
         <if test="buildingName != null and buildingName != ''">
-            AND building_name = #{buildingName},
+            AND building_name = #{buildingName}
         </if>
         <if test="affiliationUnit != null">
-            AND affiliation_unit = #{affiliationUnit},
+            AND affiliation_unit = #{affiliationUnit}
         </if>
         <if test="affiliationFloors != null">
-            AND affiliation_floors = #{affiliationFloors},
+            AND affiliation_floors = #{affiliationFloors}
         </if>
         <if test="houseNum != null">
-            AND house_num = #{houseNum},
+            AND house_num = #{houseNum}
         </if>
         <if test="isRental != null">
-            AND is_rental = #{isRental},
+            AND is_rental = #{isRental}
         </if>
         <if test="isVacant != null">
-            AND is_vacant = #{isVacant},
+            AND is_vacant = #{isVacant}
         </if>
         <if test="keywords != null and keywords != ''">
         AND (
@@ -942,4 +956,86 @@
             t1.is_delete = 0
     </select>
 
+    <!-- 以房找人列表 -->
+    <select id="findPopulation" parameterType="map" resultMap="populationDTO">
+        SELECT
+            t2.population_id,
+            t2.house_id,
+            t2.population_info_id,
+            t2.name,
+            t2.card_num,
+            t2.phone,
+            t2.bind_time,
+            t2.creator,
+            t2.gmt_create,
+            t2.modifier,
+            t2.gmt_modified,
+            t2.is_delete,
+            1
+        FROM
+        house_house t1 INNER JOIN house_population t2 ON t1.house_id = t2.house_id
+        WHERE
+        t1.is_delete = 0
+        AND t2.is_delete = 0
+        <if test="street != null and street != ''">
+            AND street = #{street}
+        </if>
+        <if test="streetName != null and streetName != ''">
+            AND street_name = #{streetName}
+        </if>
+        <if test="community != null and community != ''">
+            AND community = #{community}
+        </if>
+        <if test="communityName != null and communityName != ''">
+            AND community_name = #{communityName}
+        </if>
+        <if test="residentialId != null and residentialId != ''">
+            AND residential_id = #{residentialId}
+        </if>
+        <if test="residentialName != null and residentialName != ''">
+            AND residential_name = #{residentialName}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            AND building_id = #{buildingId}
+        </if>
+        <if test="buildingName != null and buildingName != ''">
+            AND building_name = #{buildingName}
+        </if>
+        <if test="affiliationUnit != null">
+            AND affiliation_unit = #{affiliationUnit}
+        </if>
+        <if test="affiliationFloors != null">
+            AND affiliation_floors = #{affiliationFloors}
+        </if>
+        <if test="houseNum != null">
+            AND house_num = #{houseNum}
+        </if>
+        <if test="isRental != null">
+            AND is_rental = #{isRental}
+        </if>
+        <if test="isVacant != null">
+            AND is_vacant = #{isVacant}
+        </if>
+        <if test="keywords != null and keywords != ''">
+            AND (
+            t1.id LIKE CONCAT('%', #{keywords}, '%')
+            )
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="houseIds != null and houseIds.size > 0">
+            AND
+            t1.house_id IN
+            <foreach collection="houseIds" index="index" open="(" separator="," close=")">
+                #{houseIds[${index}]}
+            </foreach>
+        </if>
+    </select>
+
 </mapper>

src/main/resources/mybatis/mapper/population/population-mapper.xml

@@ -229,6 +229,7 @@
             t1.card_num LIKE CONCAT('%', #{keywords}, '%')
             OR t1.phone LIKE CONCAT('%', #{keywords}, '%')
             OR t1.name LIKE CONCAT('%', #{keywords}, '%')
+            OR t1.house_id LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
         <if test="houseId != null and houseId != ''">