社区后台基础数据库修改

tangxiaobao

2021-07-16 47655cdeba92cc4414e41a806093af2cbdaa1ec4

社区后台基础数据库修改

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

@@ -199,10 +199,10 @@
            "AND cmp.sex = #{comMngPopulationVO.sex} " +
            " </if> " +
            "<if test='comMngPopulationVO.ageStartTime != null and comMngPopulationVO.ageStartTime != &quot;&quot;'>" +
            "AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ >= ]]> #{comMngPopulationVO.ageStartTime} " +
            "AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ <= ]]> #{comMngPopulationVO.ageStartTime} " +
            " </if> " +
            "<if test='comMngPopulationVO.ageEndTime != null and comMngPopulationVO.ageEndTime != &quot;&quot;'>" +
            "AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ <= ]]> #{comMngPopulationVO.ageEndTime} " +
            "AND date_format(cmp.birthday,'%Y-%m-%d') <![CDATA[ >= ]]> #{comMngPopulationVO.ageEndTime} " +
            " </if> " +
            "<if test='comMngPopulationVO.nativePlace != null and comMngPopulationVO.nativePlace != &quot;&quot;'>" +
            "AND cmp.native_place LIKE concat(#{comMngPopulationVO.nativePlace},'%') " +

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

@@ -27,6 +27,9 @@
    @Select("select house_id from com_mng_population_house_user where popul_id = #{populationId}")
    List<Long> getPopulationHouseIdByUserId(@Param("populationId") Long populationId);

    @Select("select relation from com_mng_population_house_user where popul_id = #{populationId}")
    List<Integer> getPopulationRelationByUserId(@Param("populationId") Long populationId);

    @Select("select popul_id from com_mng_population_house_user where house_id = #{houseId}")
    List<Long> getPopulationHouseIdByhHosueId(@Param("houseId") Long houseId);


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

@@ -180,7 +180,11 @@
//        if (!comMngFamilyInfoVOS.isEmpty()) {
//            comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
//        }

        //设置户主关系
        ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
        if (comMngPopulationHouseUserDO != null) {
            comMngPopulationVO.setRelation(comMngPopulationHouseUserDO.getRelation());
        }
        //设置年龄
        if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
            comMngPopulationVO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationVO.getBirthday()));
@@ -403,6 +407,7 @@
            if (populationDO == null) {
                //不存在实有人口,则新增
                populationDO = savePopulationDO(vo, comActDO, comMngVillageDO);
                ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = savePopulationHouseUser(vo, populationDO, populationHouseDO);
            } else {
                //如果存在人口信息，且是自用房，则更新人口默认的房屋信息
                if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
@@ -519,6 +524,19 @@
        }
        comMngPopulationHouseDAO.insert(populationHouseDO);
        return populationHouseDO;
    }

    private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo, ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
        //查询该房屋未建立，执行建立房屋信息
        ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
        populationHouseUserDO.setId(Snowflake.getId());
        populationHouseUserDO.setPopulId(comMngPopulationDO.getId());
        populationHouseUserDO.setHouseId(comMngPopulationHouseDO.getId());
        populationHouseUserDO.setRelationId(comMngPopulationHouseDO.getStatus());
        populationHouseUserDO.setRelation(vo.getRelation());
        populationHouseUserDO.setCreateAt(new Date());
        comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
        return populationHouseUserDO;
    }

    /**
@@ -751,7 +769,15 @@
                }
            }
        }
        populationDO.setUpdateAt(new Date());

        //查询当前用户所有戶主关系
        List<Integer> relations = comMngPopulationHouseUserDAO.getPopulationRelationByUserId(vo.getId());
        if (!relations.isEmpty()) {
            ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
                    .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
            comMngPopulationHouseUserDO.setRelation(relations.get(relations.size() - 1));
            comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
        }
        if (populationDAO.updateById(populationDO) > 0) {
            return R.ok();
        } else {