101captain
2021-09-28 4918b9572359a2e6a13a671c5dce8d39121b99e5
基础数据修改
8个文件已修改
6个文件已添加
638 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDetailVO.java 187 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActFourMemberApi.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbMemberDO.java 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActFourMemberService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -43,4 +44,17 @@
        commonPage.setStatus(1);
        return this.communityService.comActFourMemberSelectAll(commonPage);
    }
    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComMngPopulationVO.class)
    @PostMapping("queryMember")
    public R selectMember(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        return this.communityService.comActFourMemberQueryMember(commonPage);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationDetailVO.java
New file
@@ -0,0 +1,187 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.ComMngHouseVo;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.util.List;
/**
 * @author zzj
 */
@Data
@ApiModel
public class ComMngPopulationDetailVO {
    /**
     * 自增 id
     */
    @ApiModelProperty("实有人口id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 街道id
     */
    @ApiModelProperty("街道id")
    private Integer streetId;
    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Integer actId;
    /**
     * 小区id(实有房屋id)
     */
    @ApiModelProperty("小区id(实有房屋id)")
    @JsonSerialize(using = ToStringSerializer.class)
    private long villageId;
    /**
     * 家庭成员(姓名)
     */
    @ApiModelProperty("家庭成员(姓名)")
    @NotBlank(groups = {AddGroup.class}, message = "家庭成员(姓名)不可为空")
    private String name;
    @ApiModelProperty("性别(1.男 2.女 3.未知)")
    @NotBlank(groups = {AddGroup.class}, message = "性别不可为空")
    private Integer sex;
    @ApiModelProperty("年龄")
    @NotBlank(groups = {AddGroup.class}, message = "年龄不可为空")
    private Integer age;
    @ApiModelProperty("身份证号码")
    @NotBlank(groups = {AddGroup.class}, message = "身份证号码不可为空")
    private String cardNo;
    @ApiModelProperty("出生年月")
    private String birthday;
    @ApiModelProperty("街路巷")
    @NotBlank(groups = {AddGroup.class}, message = "街路巷不可为空")
    private String road;
    @ApiModelProperty("门牌号")
    @NotBlank(groups = {AddGroup.class}, message = "门牌号不可为空")
    private String doorNo;
    @ApiModelProperty("楼排号")
    @NotBlank(groups = {AddGroup.class}, message = "楼排号不可为空")
    private String floor;
    @ApiModelProperty("单元号")
    @NotBlank(groups = {AddGroup.class}, message = "单元号不可为空")
    private String unitNo;
    @ApiModelProperty("户室(房间号)")
    private String houseNo;
    @ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
    private Integer politicalOutlook;
    @ApiModelProperty("政治面貌名称")
    private String politicalOutlookName;
    @ApiModelProperty("工作单位")
    private String workCompany;
    @ApiModelProperty("特殊情况")
    private String specialSituation;
    @ApiModelProperty("联系方式")
    private String phone;
    @ApiModelProperty("备注")
    private String remark;
    @ApiModelProperty("标签集合(多个标签以,隔开,如物业工作人员,物业")
    private String label;
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;
    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;
    @ApiModelProperty("籍贯")
    private String nativePlace;
    @ApiModelProperty("民族")
    private String nationCode;
    @ApiModelProperty("民族")
    private String nation;
    @ApiModelProperty("小区名字")
    private String alley;
    @ApiModelProperty("户主关系列表")
    private List<ComHouseMemberVo> comMngFamilyInfoVOS;
    @ApiModelProperty("家庭成员信息")
    private List<ComMngFamilyInfoVO> familyInfoVOList;
    @ApiModelProperty("用户电子档信息")
    private UserElectronicFileVO userElectronicFileVO;
    @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
    @NotBlank(groups = {AddGroup.class}, message = "是否租住不可为空")
    private Integer isRent;
    @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
    private Integer cultureLevel;
    @ApiModelProperty("文化程度名称")
    private String cultureLevelName;
    @ApiModelProperty("职业")
    private String profession;
    @ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
    private Integer marriage;
    @ApiModelProperty("婚姻状况名称")
    private String marriageName;
    @ApiModelProperty("健康状况")
    private String healthy;
    @ApiModelProperty("外地or本地(1.本地  2.外地)")
    private Integer outOrLocal;
    @ApiModelProperty("户口所在地")
    private String censusRegister;
    /**
     * 居住地址
     */
    @ApiModelProperty("居住地址")
    private String address;
    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
    private Integer relation;
    @ApiModelProperty("与户主关系名称")
    private String relationName;
    @ApiModelProperty("身份证无加密字段")
    private String cardNoStr;
    @ApiModelProperty("房屋列表")
    private List<ComMngHouseVo> houseList;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -189,6 +189,9 @@
    @ApiModelProperty("与户主关系名称")
    private String relationName;
    @ApiModelProperty("身份证无加密字段")
    private String cardNoStr;
    @ApiModelProperty("房屋列表")
    private List<ComMngHouseVo> houseList;
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/FourMemberDetailVO.java
New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.model.vos.community;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @author zzj
 */
@Data
@ApiModel
public class FourMemberDetailVO {
    @ApiModelProperty("基础数据及房屋数据")
    private ComMngPopulationVO comMngPopulationVO;
    @ApiModelProperty("党员数据")
    private ComPbMemberVO partyBuildingMemberVO;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbMemberVO.java
New file
@@ -0,0 +1,91 @@
package com.panzhihua.common.model.vos.partybuilding;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
 * @author zzj
 */
@Data
@ApiModel
public class ComPbMemberVO {
    private Long id;
    /**
     * 所属党组织id
     */
    @ApiModelProperty("所属党组织id")
    private Long orgId;
    /**
     * 身份证号
     */
    @ApiModelProperty("身份证号")
    private String idCard;
    /**
     * 姓名
     */
    @ApiModelProperty("姓名")
    private String name;
    /**
     * 头像图片路径
     */
    @ApiModelProperty("头像图片路径")
    private String photoPath;
    /**
     * 入党时间
     */
    @ApiModelProperty("入党时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date joinTime;
    /**
     * 转正时间
     */
    @ApiModelProperty("转正时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date employmentTime;
    /**
     * 党员审查结果
     */
    private Integer auditResult;
    /**
     * 创建时间
     */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date createAt;
    /**
     * 修改时间
     */
    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date updateAt;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 用户id
     */
    private Long userId;
    /**
     * 驳回原因
     */
    private String refuseReason;
    @ApiModelProperty("手机号")
    private String phone;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -6554,4 +6554,10 @@
     */
    @PostMapping("/cluster/member/export/admin")
    R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
    /**
     * 小程序四长四员查询居民列表
     */
    @PostMapping("/comActFourMember/member")
    R comActFourMemberQueryMember(@RequestBody CommonPage commonPage);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActFourMemberApi.java
@@ -84,4 +84,20 @@
    public R delete(@RequestBody ComActFourMemberVO comActFourMember) {
        return this.comActFourMemberService.delete(comActFourMember);
    }
    /**
     * 小程序四长四员查询居民列表
     */
    @PostMapping("/member")
    public R query(@RequestBody CommonPage commonPage){
        return this.comActFourMemberService.selectByMember(commonPage);
    }
    /**
     *居民数据详情
     */
    @GetMapping("/memberDetail")
    public R memberDetail(@RequestParam("id")Long id){
        return this.comActFourMemberService.selectById(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -5,6 +5,8 @@
import java.util.Map;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO;
import com.panzhihua.common.model.vos.community.VillageVO;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
@@ -685,4 +687,17 @@
     * @return
     */
    List<VillageVO> getSecondHouseAddress(Long communityId);
    /**
     * 四长四员分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComMngPopulationVO> query(Page page,@Param("commonPage") CommonPage commonPage);
    /**
     * 居民详情
     */
    ComMngPopulationDetailVO getById(Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPbMemberDAO.java
New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_community.model.dos.ComPbMemberDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 10:52
 **/
@Mapper
public interface ComPbMemberDAO extends BaseMapper<ComPbMemberDO> {
    /**
     * 根据用户手机号查询党员信息
     * @param phone
     * @return
     */
    ComPbMemberVO selectById(String phone);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbMemberDO.java
New file
@@ -0,0 +1,88 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 党员
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 10:48
 **/
@Data
@TableName("com_pb_member")
public class ComPbMemberDO implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 党员在表中的id
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     * 所属党组织id
     */
    private Long orgId;
    /**
     * 身份证号
     */
    private String idCard;
    /**
     * 姓名
     */
    private String name;
    /**
     * 头像图片路径
     */
    private String photoPath;
    /**
     * 入党时间
     */
    private Date joinTime;
    /**
     * 转正时间
     */
    private Date employmentTime;
    /**
     * 党员审查结果
     */
    private Integer auditResult;
    /**
     * 创建时间
     */
    private Date createAt;
    /**
     * 修改时间
     */
    private Date updateAt;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 用户id
     */
    private Long userId;
    /**
     * 驳回原因
     */
    private String refuseReason;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActFourMemberService.java
@@ -40,4 +40,14 @@
    R delete(ComActFourMemberVO comActFourMemberVO);
    R get(Integer id);
    /**
     * 小程序四长四员查询居民列表
     */
    R selectByMember(CommonPage commonPage);
    /**
     * 居民详情
     */
    R selectById(Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
@@ -2,22 +2,40 @@
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.enums.PopulCultureLevelEnum;
import com.panzhihua.common.enums.PopulMarriageEnum;
import com.panzhihua.common.enums.PopulPoliticalOutlookEnum;
import com.panzhihua.common.enums.PopulRelationEnum;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.FourMemberDetailVO;
import com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
import com.panzhihua.common.model.vos.user.ComMngHouseVo;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComMngBuildingDAO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.ComActCommittee;
import com.panzhihua.service_community.entity.ComActFourMember;
import com.panzhihua.service_community.dao.ComActFourMemberDao;
import com.panzhihua.service_community.model.dos.ComMngBuildingDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseUserDO;
import com.panzhihua.service_community.model.dos.ComPbMemberDO;
import com.panzhihua.service_community.service.ComActFourMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.List;
@@ -38,6 +56,14 @@
    private ComMngBuildingDAO comMngBuildingDAO;
    @Resource
    private UserService userService;
    @Resource
    private ComMngPopulationDAO comMngPopulationDAO;
    @Resource
    private ComPbMemberDAO comPbMemberDAO;
    @Resource
    private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
    @Resource
    private ComMngPopulationHouseDAO comMngPopulationHouseDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -154,4 +180,76 @@
    public R get(Integer id) {
        return R.ok(comActFourMemberDao.getById(id));
    }
    @Override
    public R selectByMember(CommonPage commonPage) {
        IPage<ComMngPopulationVO> comMngPopulationDOIPage=this.comMngPopulationDAO.query(new Page<ComMngPopulationDO>(commonPage.getPage(),commonPage.getSize()),commonPage);
        if (!comMngPopulationDOIPage.getRecords().isEmpty()) {
            comMngPopulationDOIPage.getRecords().forEach(populDO -> {
                if (StringUtils.isNotEmpty(populDO.getBirthday())) {
                    populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
                }
            });
        }
        return R.ok(comMngPopulationDOIPage);
    }
    @Override
    public R selectById(Long id) {
        FourMemberDetailVO fourMemberDetailVO=new FourMemberDetailVO();
        ComMngPopulationDO comMngPopulationDO = comMngPopulationDAO.selectById(id);
        if (ObjectUtils.isEmpty(comMngPopulationDO)) {
            return R.fail("用户信息不存在");
        }
        // if(StringUtils.isNotEmpty(comMngPopulationDO.getBirthday())){//计算年龄
        // comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
        // }
        ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
        BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
        // 查询户主关系信息
        // List<ComHouseMemberVo> comMngFamilyInfoVOS =
        // populationDAO.listHouseMermberByUserId(comMngPopulationDO.getHouseId(),comMngPopulationDO.getId());
        // if (!comMngFamilyInfoVOS.isEmpty()) {
        // comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
        // }
        // 查询户主关系信息
        List<ComHouseMemberVo> comMngFamilyInfoVOS = comMngPopulationDAO.listHouseMermberByPopuId(comMngPopulationDO.getId());
        if (!comMngFamilyInfoVOS.isEmpty()) {
            for (ComHouseMemberVo comHouseMemberVo : comMngFamilyInfoVOS) {
                comHouseMemberVo.setAge(AgeUtils.getAgeFromBirthTimes(comHouseMemberVo.getBirthDay()));
            }
            comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
        }
        // 设置户主关系
        List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS =
                comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
                        .eq(ComMngPopulationHouseUserDO::getPopulId, id)));
        if (!comMngPopulationHouseUserDOS.isEmpty()) {
            comMngPopulationVO
                    .setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
        }
        // 设置年龄
        if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
            comMngPopulationVO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationVO.getBirthday()));
        }
        // 查询当前用户房屋信息
        List<ComMngHouseVo> houseList = comMngPopulationHouseDAO.getPopulHouseListByPopulId(id);
        if (!houseList.isEmpty()) {
            houseList.forEach(house -> {
            });
            comMngPopulationVO.setHouseList(houseList);
        }
        if(comMngPopulationVO!=null&&StringUtils.isNotEmpty(comMngPopulationVO.getPhone())){
            fourMemberDetailVO.setComMngPopulationVO(comMngPopulationVO);
            ComPbMemberVO comPbMemberDO=comPbMemberDAO.selectById(comMngPopulationVO.getPhone());
            if(comPbMemberDO!=null){
                fourMemberDetailVO.setPartyBuildingMemberVO(comPbMemberDO);
            }
        }
        return R.ok(fourMemberDetailVO);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
@@ -270,4 +270,54 @@
        select t.village_id as villageId,concat(t.alley,t.house_num,'号') as villageName,t1.id,concat(t1.unit_no,'栋',t1.floor,'单元',t1.code,'号') as name  from com_mng_village t left join com_mng_population_house t1 on t.village_id = t1.village_id where t.community_id=#{communityId} and t1.id is not null
    </select>
    <select id="query" resultType="com.panzhihua.common.model.vos.community.ComMngPopulationVO">
        select * from com_mng_population
        <where>
            1=1
            <if test="commonPage.name !=null and commonPage.name.trim() !=''">
                and name like concat('%',#{commonPage.name},'%')
            </if>
            <if test="commonPage.paramId !=null and commonPage.paramId !=''">
                and act_id = #{commonPage.paramId}
            </if>
        </where>
    </select>
    <resultMap id="selectMap2" type="com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO">
        <id column="id" property="id" />
        <result column="street_id" property="streetId" />
        <result column="act_id" property="actId" />
        <result column="village_id" property="villageId" />
        <result column="name" property="name" />
        <result column="sex" property="sex" />
        <result column="card_no" property="cardNo" />
        <result column="card_no_str" property="cardNoStr" />
        <result column="road" property="road" />
        <result column="door_no" property="doorNo" />
        <result column="floor" property="floor" />
        <result column="unit_no" property="unitNo" />
        <result column="phone" property="phone"/>
        <result column="house_no" property="houseNo" />
        <result column="political_outlook" property="politicalOutlook" />
        <result column="work_company" property="workCompany" />
        <result column="special_situation" property="specialSituation" />
        <result column="remark" property="remark" />
        <result column="create_at" property="createAt" />
        <result column="update_at" property="updateAt" />
        <result column="address" property="address" />
        <collection property="houseList" column="{id = id}" ofType="com.panzhihua.common.model.vos.user.ComMngHouseVo"  javaType="java.util.ArrayList">
            <result column="house_address" property="address"/>
            <result column="house_house_id" property="houseId" />
            <result column="house_residence" property="residence" />
            <result column="popul_id" property="populId"/>
            <result column="status" property="status"/>
            <result column="s_relation" property="relation"/>
            <result column="s_srelation_id" property="relationId"/>
        </collection>
    </resultMap>
    <select id="getById" resultMap="selectMap2">
         select t.*,t2.address as house_address,t2.house_id as house_house_id ,t2.residence as  house_residence ,t2.status,t2.relation as s_relation,t2.relation_id as s_relation_id,t2.popul_id from com_mng_population t left join ( select t.address,t1.house_id,t1.popul_id,t1.relation,t1.relation_id,t.status,t1.residence from com_mng_population_house t left join com_mng_population_house_user t1 on t.id = t1.house_id) t2 on t.id = t2.popul_id where t.id =#{id}
    </select>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml
New file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComPbMemberDAO">
    <select id="selectById" resultType="com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO">
        select t.*,t1.phone from com_pb_member t left join sys_user t1 on t.user_id = t1.user_id where t1.phone =#{phone}
    </select>
</mapper>