tangxiaobao
2021-07-26 4a333fb2788a4422432442f7dff9866be9cce94a
基础数据库bug修改
3个文件已修改
15 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationHouseEditDTO.java
@@ -16,18 +16,18 @@
    @ApiModelProperty("实有房屋id")
    private Long id;
    @ApiModelProperty(value = "是否是居住地(1.是 2.否)")
    @ApiModelProperty(value = "是否是居住地(1.是 0.否)")
    private Integer isResidence;
    @ApiModelProperty("与户主关系")
    private Integer relation;
    /**
     * 是否是居住地(1.是 2.否)
     * 是否是居住地(1.是 0.否)
     */
    public interface isResidence{
        int yes = 1;
        int no = 2;
        int no = 0;
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java
@@ -47,6 +47,11 @@
    private Integer relationId;
    /**
     * 人和房屋关系’ (1.是、0.否)
     */
    private Integer residence;
    /**
     * 入住开始时间
     */
    private Date startAt;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -454,6 +454,7 @@
                    populationHouseUserDO.setPopulId(populationDO.getId());
                    populationHouseUserDO.setRelation(vo.getRelation());
                    populationHouseUserDO.setRelationId(vo.getIsRent());
                    populationHouseUserDO.setResidence(vo.getResidence());
                    comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
                }
            }
@@ -814,6 +815,9 @@
                populationHouseUserDO.setRelation(houseEditDto.getRelation());
                if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {
                    houseId = houseEditDto.getId();//居住地
                    populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.yes);
                }else {
                    populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.no);
                }
                populationHouseUserDOList.add(populationHouseUserDO);