基础数据功能修改

101captain

2021-09-29 d6d00c7fbd97c6243cc259f563f081a1e479a9a2

基础数据功能修改

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

@@ -2,11 +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.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.FourMemberDetailVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.*;

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

/**
 * (ComActFourMember)表控制层
@@ -67,4 +68,97 @@
        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

@@ -250,10 +250,16 @@
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        Long id = partyBuildingMemberVO.getId();
        if (null == id || 0 == id) {
            return R.fail("党员id不能为空");
        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 partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
        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/partybuilding/ComPbMemberVO.java

@@ -43,14 +43,14 @@
     * 入党时间
     */
    @ApiModelProperty("入党时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date joinTime;

    /**
     * 转正时间
     */
    @ApiModelProperty("转正时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date employmentTime;

    /**
@@ -88,4 +88,7 @@
    @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
@@ -6566,4 +6576,44 @@
     */
    @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/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/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

@@ -22,8 +22,8 @@
public interface ComPbMemberDAO extends BaseMapper<ComPbMemberDO> {
    /**
     * 根据用户手机号查询党员信息
     * @param phone
     * @param idCard
     * @return
     */
    ComPbMemberVO selectById(String phone);
    ComPbMemberVO selectById(String idCard);
}

 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

@@ -243,9 +243,9 @@
            comMngPopulationVO.setHouseList(houseList);
        }

        if(comMngPopulationVO!=null&&StringUtils.isNotEmpty(comMngPopulationVO.getPhone())){
        if(comMngPopulationVO!=null&&StringUtils.isNotEmpty(comMngPopulationVO.getCardNoStr())){
            fourMemberDetailVO.setComMngPopulationVO(comMngPopulationVO);
            ComPbMemberVO comPbMemberDO=comPbMemberDAO.selectById(comMngPopulationVO.getPhone());
            ComPbMemberVO comPbMemberDO=comPbMemberDAO.selectById(comMngPopulationVO.getCardNoStr());
            if(comPbMemberDO!=null){
                fourMemberDetailVO.setPartyBuildingMemberVO(comPbMemberDO);
            }

 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/ComPbMemberMapper.xml

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