Merge branch 'base_data' into test

101captain

2021-09-29 de291fdd4ed240c6f5c2c70070beebbb323dc4f6

Merge branch 'base_data' into test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActFourMemberApi.java

@@ -2,9 +2,11 @@


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * (ComActFourMember)表控制层
@@ -43,4 +46,119 @@
        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);
    }

    /**
     *居民数据详情
     */
    @ApiOperation(value = "居民数据详情",response = FourMemberDetailVO.class)
    @GetMapping("/memberDetail")
    public R memberDetail(@RequestParam("id")Long id){
        return this.communityService.comActFourMemberMemberDetail(id);
    }

    @ApiOperation(value = "房屋级联菜单查询")
    @PostMapping("/cascade/list")
    public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        // 获取登陆用户绑定社区id
        LoginUserInfoVO loginUser = this.getLoginUserInfo();
        if (loginUser != null) {
            cascadeHouseDTO.setCommunityId(loginUser.getCommunityId());
        }
        return communityService.getCascadeHouseAddress(cascadeHouseDTO);
    }

    /**
     * 查询房屋二级级联菜单
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @ApiOperation(value = "房屋级联菜单查询")
    @PostMapping("/second/list")
    public R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        cascadeHouseDTO.setCommunityId(this.getCommunityId());
        return communityService.getSecondHouseAddress(cascadeHouseDTO);
    }

    @ApiOperation(value = "分页查询实有房屋列表", response = ComMngPopulationHouseAdminVO.class)
    @PostMapping("/pageHouse")
    public R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO) {
        // 获取登陆用户绑定社区id
        LoginUserInfoVO loginUser = this.getLoginUserInfo();
        if (loginUser != null) {
            populationHouseAdminDTO.setCommunityId(loginUser.getCommunityId());
        }
        return communityService.pageHouse(populationHouseAdminDTO);
    }

    @ApiOperation(value = "查询实有房屋详情", response = ComMngPopulationHouseDetailAdminVO.class)
    @PostMapping("/house/detail")
    public R getHouseDetail(@RequestParam(value = "houseId") Long houseId) {
        return communityService.getHouseDetail(houseId);
    }

    /**
     * 编辑实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @ApiOperation(value = "编辑实有房屋信息")
    @PostMapping("/population/house/user/edit")
    public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return communityService.editHouseUser(comMngPopulationHouseUserVO);
    }

    /**
     * 新增实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @ApiOperation(value = "新增实有房屋信息")
    @PostMapping("/population/house/user/insert")
    public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return communityService.insertHouseUser(comMngPopulationHouseUserVO);
    }

    /**
     * 根据房屋id列表删除房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 删除结果
     */
    @ApiOperation(value = "删除实有房屋信息")
    @PostMapping("/population/house/user/delete")
    public R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return communityService.deleteHousesUser(comMngPopulationHouseUserVO);
    }

    /**
     * 根据id查询
     *
     * @param id
     *            请求参数
     * @return 删除结果
     */
    @ApiOperation(value = "id查询信息")
    @GetMapping("/population/house/user/detail")
    public R detailHousesUser(@RequestParam("id") Long id) {
        return communityService.detailHousesUser(id);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyHelpApi.java

@@ -42,6 +42,7 @@
    @ApiOperation(value = "分页查询所有数据",response = ComPropertyVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setStatus(1);
        return this.propertyService.comPropertyHelpSelectAll(commonPage);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -4,6 +4,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.interfaces.OperLog;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -244,4 +245,21 @@
        // }
        return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
    }

    @OperLog(operModul = "党员管理", operType = 2)
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        if(partyBuildingMemberVO.getIsPb()!=null){
            Long id = partyBuildingMemberVO.getId();
            if(partyBuildingMemberVO.getIsPb()==1){
                if (null == id || 0 == id) {
                    return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
                }
                return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
            }
            return partyBuildingService.deleteprepartybuildingmember(id);
        }
        return R.fail();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseInsertAdminDTO.java

New file
@@ -0,0 +1,132 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * 实有房屋新增请求参数
 * @author zzj
 */
@Data
@ApiModel("实有房屋新增请求参数")
public class ComMngPopulationHouseInsertAdminDTO implements Serializable {

    /**
     * 房屋地址
     */
    @ApiModelProperty("房屋地址")
    private String address;

    /**
     * 房屋编号
     */
    @ApiModelProperty("房屋编号")
    private String code;

    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;

    /**
     * 街路巷id
     */
    @ApiModelProperty("街路巷id")
    private String alley;

    /**
     * 门牌号
     */
    @ApiModelProperty("门牌号")
    private String houseNum;

    /**
     * 楼排号
     */
    @ApiModelProperty("楼排号")
    private String floor;
    /**
     * 单元号
     */
    @ApiModelProperty("单元号")
    private String unitNo;
    /**
     * 户室（房间号）
     */
    @ApiModelProperty("户室（房间号）")
    private String houseNo;

    /**
     * 房屋状态(1.自住 2.租住 3.其他)
     */
    @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)")
    private Integer status;

    /**
     * 房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)
     */
    @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)")
    private Integer purpose;

    /**
     * 管控状态(1.常规 2.关注 3.管控)
     */
    @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)")
    private Integer controlStatus;

    /**
     * 空户(1.是 2.否)
     */
    @ApiModelProperty("空户(1.是 2.否)")
    private Integer isEmpty;

    /**
     * 建筑用途
     */
    @ApiModelProperty("建筑用途")
    private String constructPurpose;

    /**
     * 建筑面积
     */
    @ApiModelProperty("建筑面积")
    private BigDecimal constructArea;

    /**
     * 创建时间
     */
    private Date createAt;

    /**
     * 修改时间
     */
    private Date updateAt;

    /**
     * 小区id
     */
    @ApiModelProperty("小区id")
    private Long villageId;

    /**
     * 街道id
     *
     * @return
     */
    @ApiModelProperty("街道id")
    private Long streetId;

    /**
     * 层次递归字段（省>市>区县>街道>社区>小区>详细地址）
     */
    private String path;
    @ApiModelProperty("人员id")
    private Long populationId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseUserVO.java

New file
@@ -0,0 +1,41 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel
public class ComMngPopulationHouseUserVO {
    private Long id;

    /**
     * 实有人口id
     */
    @ApiModelProperty("实有人口id")
    private Long populId;

    /**
     * 实有房屋id
     */
    @ApiModelProperty("实有房屋id")
    private Long houseId;

    /**
     * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
     */
    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
    private Integer relation;

    /**
     * 人和房屋关系’ (1.自住2、租住)
     */
    @ApiModelProperty("人和房屋关系’ (1.自住2、租住)")
    private Integer relationId;

    /**
     * 人和房屋关系’ (1.是、0.否)
     */
    @ApiModelProperty("人和房屋关系’ (1.是、0.否)")
    private Integer residence;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -178,4 +178,7 @@
    @ApiModelProperty("高龄认证显示提示（1.是 2.否）")
    private Integer bigAgeTips;

    @ApiModelProperty("是否四长四员 1.是 2.否")
    private Integer isFourMember;

}

 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,94 @@
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", timezone = "GMT+8")
    private Date joinTime;

    /**
     * 转正时间
     */
    @ApiModelProperty("转正时间")
    @JsonFormat(pattern = "yyyy-MM-dd", 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;

    @ApiModelProperty("党组织")
    private String orgName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java

@@ -54,4 +54,6 @@
    private Integer auditResult;
    @ApiModelProperty(value = "驳回原因")
    private String refuseReason;
    @ApiModelProperty(value = "是否党员 1是 2否")
    private Integer isPb;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java

@@ -21,19 +21,28 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long populId;

    @ApiModelProperty("人和房屋关系")
    @ApiModelProperty("人和房屋关系’ (1.自住2、租住)(取字典表国家标准编码)")
    private Integer relationId;

    @ApiModelProperty("与户主关系")
    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)(取字典表国家标准编码)")
    private Integer relation;

    @ApiModelProperty("房屋地址")
    private String address;

    @ApiModelProperty("房屋状态")
    @ApiModelProperty("房屋状态(1.自住 2.租住 3.其他)(取字典表国家标准编码)")
    private Integer status;

    @ApiModelProperty("是否居住地 1.是 0.否")
    private Integer residence;

    @ApiModelProperty("房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他)(取字典表国家标准编码)")
    private Integer purpose;

    @ApiModelProperty("管控状态(1.常规 2.关注 3.管控)(取字典表国家标准编码)")
    private Integer controlStatus;

    @ApiModelProperty("关系主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -3564,6 +3564,16 @@
    R deleteHouses(@RequestBody List<Long> Ids);

    /**
     * 新增实有房屋信息
     *
     * @param houseEditAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/insert")
    R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO);

    /**
     * 实有房屋统计
     *
     * @param communityId
@@ -6563,4 +6573,56 @@
     */
    @PostMapping("pagemicrowishAdmin")
    R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 小程序四长四员查询居民列表
     */
    @PostMapping("/comActFourMember/member")
    R comActFourMemberQueryMember(@RequestBody CommonPage commonPage);

    /**
     *居民数据详情
     */
    @GetMapping("/comActFourMember/memberDetail")
    R comActFourMemberMemberDetail(@RequestParam("id")Long id);

    /**
     * 根据房屋id列表删除房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 删除结果
     */
    @PostMapping("/common/data/population/house/user/delete")
    R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 新增实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/user/insert")
    public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 编辑实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/user/edit")
    public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 根据id查询
     *
     * @param id
     *            请求参数
     * @return 删除结果
     */
    @GetMapping("/common/data/population/house/user/detail")
    public R detailHousesUser(@RequestParam("id") Long id);
}

 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/api/CommonDataApi.java

@@ -4,6 +4,8 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -46,6 +48,8 @@
    private ComMngPopulationHouseService comMngPopulationHouseService;
    @Resource
    private ComMngVillageService comMngVillageService;
    @Resource
    private ComMngPopulationHouseUserService comMngPopulationHouseUserService;

    /**
     * 小程序用户车辆登记
@@ -800,6 +804,18 @@
    }

    /**
     * 新增实有房屋信息
     *
     * @param houseEditAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/population/house/insert")
    public R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO) {
        return comMngPopulationHouseService.insertHouse(houseEditAdminDTO);
    }

    /**
     * 根据房屋id列表删除房屋信息
     *
     * @param Ids
@@ -846,4 +862,52 @@
    public R villageStatistics(@RequestParam("communityId") Long communityId) {
        return comMngVillageService.villageStatistics(communityId);
    }

    /**
     * 编辑实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/population/house/user/edit")
    public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return comMngPopulationHouseUserService.updateAll(comMngPopulationHouseUserVO);
    }

    /**
     * 新增实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/population/house/user/insert")
    public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return comMngPopulationHouseUserService.insert(comMngPopulationHouseUserVO);
    }

    /**
     * 根据房屋id列表删除房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 删除结果
     */
    @PostMapping("/population/house/user/delete")
    public R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return comMngPopulationHouseUserService.delete(comMngPopulationHouseUserVO);
    }

    /**
     * 根据id查询
     *
     * @param id
     *            请求参数
     * @return 删除结果
     */
    @GetMapping("/population/house/user/detail")
    public R detailHousesUser(@RequestParam("id") Long id) {
        return comMngPopulationHouseUserService.detail(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;
@@ -693,4 +695,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/ComMngPopulationHouseDAO.java

@@ -28,7 +28,7 @@
@Mapper
public interface ComMngPopulationHouseDAO extends BaseMapper<ComMngPopulationHouseDO> {

    @Select("select cmphu.house_id,cmph.address,cmph.status,cmphu.popul_id,cmphu.residence,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu "
    @Select("select cmphu.id, cmphu.house_id,cmph.address,cmph.status,cmph.purpose,cmph.control_status,cmphu.popul_id,cmphu.residence,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu "
        + " left join com_mng_population_house as cmph on cmph.id = cmphu.house_id "
        + " where cmphu.popul_id = #{populId}")
    List<ComMngHouseVo> getPopulHouseListByPopulId(@Param("populId") Long populId);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationHouseUserDAO.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.vos.user.ComMngHouseVo;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -61,4 +62,9 @@
        + ",#{item.relation},#{item.residence},#{item.startAt},#{item.endAt}" + ",now())" + "    </foreach>"
        + " </script>")
    void insertAll(@Param("houseUserList") List<ComMngPopulationHouseUserDO> houseUserList);

    @Select("select cmphu.id, cmphu.house_id,cmph.address,cmph.status,cmph.purpose,cmph.control_status,cmphu.popul_id,cmphu.residence,cmphu.relation_id,cmphu.relation from com_mng_population_house_user cmphu "
            + " left join com_mng_population_house as cmph on cmph.id = cmphu.house_id "
            + " where cmphu.id = #{id}")
    ComMngHouseVo detail(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 idCard
     * @return
     */
    ComPbMemberVO selectById(String idCard);
}

 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/ComMngPopulationHouseService.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
@@ -113,4 +114,12 @@

    R populationRelationHouse(ComMngPopulationRelationHouseDTO relationHouseDTO);

    /**
     * 编辑实有房屋信息
     *
     * @param houseEditAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    R insertHouse(ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationHouseUserService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
@@ -34,4 +35,11 @@

    R getVillagePopulationHouseAdmin(PageComMngVillagePopulationHouseDTO villagePopulationDTO);

    R insert(ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    R updateAll(ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    R delete(ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    R detail(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.getCardNoStr())){
            fourMemberDetailVO.setComMngPopulationVO(comMngPopulationVO);
            ComPbMemberVO comPbMemberDO=comPbMemberDAO.selectById(comMngPopulationVO.getCardNoStr());
            if(comPbMemberDO!=null){
                fourMemberDetailVO.setPartyBuildingMemberVO(comPbMemberDO);
            }
        }
        return R.ok(fourMemberDetailVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java

@@ -8,6 +8,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -513,4 +514,21 @@
        return R.ok();
    }

    @Override
    @Transactional
    public R insertHouse(ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO) {
        ComMngPopulationHouseDO houseDO=new ComMngPopulationHouseDO();
        BeanUtils.copyProperties(houseEditAdminDTO, houseDO);
        houseDO.setCreateAt(new Date());
        if (this.baseMapper.insert(houseDO) > 0) {
            ComMngPopulationHouseUserDO comMngPopulationHouseUserDO=new ComMngPopulationHouseUserDO();
            comMngPopulationHouseUserDO.setHouseId(houseDO.getId());
            comMngPopulationHouseUserDO.setPopulId(houseEditAdminDTO.getPopulationId());
            comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
            return R.ok();
        } else {
            return R.fail();
        }
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseUserServiceImpl.java

@@ -4,6 +4,8 @@
import java.util.Date;
import java.util.List;

import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -111,4 +113,31 @@
            new Page(villagePopulationDTO.getPageNum(), villagePopulationDTO.getPageSize()), villagePopulationDTO));
    }

    @Override
    public R insert(ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        ComMngPopulationHouseUserDO comMngPopulationHouseUserDO=new ComMngPopulationHouseUserDO();
        BeanUtils.copyProperties(comMngPopulationHouseUserVO,comMngPopulationHouseUserDO);
        comMngPopulationHouseUserDO.setId(Snowflake.getId());
        this.baseMapper.insert(comMngPopulationHouseUserDO);
        return R.ok();
    }

    @Override
    public R updateAll(ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        ComMngPopulationHouseUserDO comMngPopulationHouseUserDO=new ComMngPopulationHouseUserDO();
        BeanUtils.copyProperties(comMngPopulationHouseUserVO,comMngPopulationHouseUserDO);
        this.baseMapper.updateById(comMngPopulationHouseUserDO);
        return R.ok();
    }

    @Override
    public R delete(ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return R.ok(this.baseMapper.deleteById(comMngPopulationHouseUserVO.getId()));
    }

    @Override
    public R detail(Long id) {
        return R.ok(this.baseMapper.detail(id));
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActFourMemberMapper.xml

@@ -41,7 +41,7 @@
    </select>

    <select id="selectBuilding" resultType="String">
        select concat(t1.group_at,t.name,'栋') from com_mng_building t left join com_mng_village t1 on t.village_id = t1.village_id where t.id in (${id})
        select distinct concat(alley,house_num,'号',IFNULL(floor,0),'栋') from com_mng_population_house   where id in (${id})
    </select>

    <select id="getById" resultMap="baseResultMap">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml

@@ -32,7 +32,7 @@
    </resultMap>

    <select id="find" resultType="String">
        select concat(t1.group_at,t.name,'栋') from com_mng_building t left join com_mng_village t1 on t.village_id = t1.village_id where t.id in (#{id})
        select distinct concat(alley,house_num,'号',IFNULL(floor,0),'栋') from com_mng_population_house   where id in (${id})
    </select>

    <resultMap id="selectMap" type="com.panzhihua.common.model.vos.community.VillageVO">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -270,6 +270,8 @@
        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>



    <delete id="deletePopulaitonRelation">
        delete from com_mng_population_community_tags where population_id in
        <foreach item="item" collection="ids" separator="," open="(" close=")" index="">
@@ -337,4 +339,54 @@
        order by cmp.create_at desc
    </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.*,t2.name as orgName from com_pb_member t left join com_mng_population t1 on t.id_card = t1.card_no_str left join com_pb_org t2 on t.org_id = t2.id where t1.card_no_str =#{idCard}
    </select>
</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/ComActFourMemberDao.java

New file
@@ -0,0 +1,21 @@
package com.panzhihua.service_user.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.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
import com.panzhihua.service_user.model.dos.ComActFourMember;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

/**
 * (ComActFourMember)表数据库访问层
 *
 * @author makejava
 * @since 2021-09-23 10:13:30
 */
@Mapper
public interface ComActFourMemberDao extends BaseMapper<ComActFourMember> {

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java

New file
@@ -0,0 +1,72 @@
package com.panzhihua.service_user.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;


/**
 * (ComActFourMember)表实体类
 *
 * @author makejava
 * @since 2021-09-23 10:13:30
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("")
public class ComActFourMember implements Serializable {

    private static final long serialVersionUID = 905771115750112478L;

    @TableId(type = IdType.AUTO)
    private Integer id;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    /**
     * 职位
     */
    @ApiModelProperty(value = "职位")
    private String position;

    /**
     * 管辖区域
     */
    @ApiModelProperty(value = "管辖区域")
    private String jurisdiction;

    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    @ApiModelProperty(value = "管辖区域内容")
    private String jurisdictionContent;

    @ApiModelProperty(value = "照片")
    private String url;

    private String password;

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -14,6 +14,8 @@

import javax.annotation.Resource;

import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -81,34 +83,6 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.EventGridMemberBuildingRelationMapper;
import com.panzhihua.service_user.dao.LcCompareMemberCodeMapper;
import com.panzhihua.service_user.dao.RoleDAO;
import com.panzhihua.service_user.dao.SysMenuDAO;
import com.panzhihua.service_user.dao.SysOperLogDAO;
import com.panzhihua.service_user.dao.SysRoleMenuDAO;
import com.panzhihua.service_user.dao.SysUserAgreementDAO;
import com.panzhihua.service_user.dao.SysUserFeedbackDAO;
import com.panzhihua.service_user.dao.SysUserInputDAO;
import com.panzhihua.service_user.dao.SysUserNoticeDAO;
import com.panzhihua.service_user.dao.SysUserRoleDAO;
import com.panzhihua.service_user.dao.UserDao;
import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
import com.panzhihua.service_user.model.dos.EventGridMemberBuildingRelationDO;
import com.panzhihua.service_user.model.dos.LcCompareCodeMemberDO;
import com.panzhihua.service_user.model.dos.SysMenuDO;
import com.panzhihua.service_user.model.dos.SysOperLogDO;
import com.panzhihua.service_user.model.dos.SysRoleDO;
import com.panzhihua.service_user.model.dos.SysRoleMenuDO;
import com.panzhihua.service_user.model.dos.SysUserAgreementDO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dos.SysUserFeedbackDO;
import com.panzhihua.service_user.model.dos.SysUserInputDO;
import com.panzhihua.service_user.model.dos.SysUserNoticeDO;
import com.panzhihua.service_user.model.dos.SysUserRoleDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService;
import com.panzhihua.service_user.service.UserService;
@@ -158,6 +132,8 @@
    private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
    @Resource
    private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
    @Resource
    private ComActFourMemberDao comActFourMemberDao;
    // @Resource
    // private GridService gridService;

@@ -346,6 +322,7 @@
            loginUserInfoVO.setRoles(set);
        }
        loginUserInfoVO.setIsmemberrole(2);
        loginUserInfoVO.setIsFourMember(2);
        // 志愿者状态
        String phone = sysUserDO.getPhone();
        Long userCommunityId = sysUserDO.getCommunityId();
@@ -363,6 +340,11 @@
                int state = comMngVolunteerMngVO.getState().intValue();
                loginUserInfoVO.setVolunteerStatus(state);
            }
            //是否四长四员
            Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getUserId,sysUserDO.getUserId()));
            if(countFourMember>0){
                loginUserInfoVO.setIsFourMember(1);
            }
            // 是否是"管理员"或者 本社区 "社区团队"、"党委成员"
            Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/ComActFourMemberMapper.xml

New file
@@ -0,0 +1,14 @@
<?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_user.dao.ComActFourMemberDao">

    <resultMap type="com.panzhihua.service_user.model.dos.ComActFourMember" id="ComActFourMemberBaseResultMap">
        <result property="id" column="id"/>
        <result property="userId" column="user_id"/>
        <result property="position" column="position"/>
        <result property="jurisdiction" column="jurisdiction"/>
        <result property="communityId" column="community_id"/>
        <result property="createTime" column="create_time"/>
        <result property="jurisdictionContent" column="jurisdiction_content"/>
    </resultMap>
</mapper>