Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -1,7 +1,11 @@
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.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseUserAdminVO;
import com.panzhihua.common.model.vos.grid.admin.ComMngVillagePopulationHouseListVO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseUserDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -23,11 +27,35 @@
    @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);

    @Select("select cmp.name,cmp.card_no,cmp.phone from com_mng_population_house_user as cmphu " +
    @Select("select cmp.id,cmp.name,cmp.card_no,cmp.phone from com_mng_population_house_user as cmphu " +
            "left join com_mng_population as cmp on cmp.id = cmphu.popul_id where cmphu.house_id = #{houseId}")
    List<ComMngPopulationHouseUserAdminVO> getHouseUserByHouseId(@Param("houseId") Long houseId);

    @Select("update com_mng_population_house_user set relation = null where id = #{id}")
    Integer delBuildingHousePopulationRelation(@Param("id") Long id);

    @Select("update com_mng_population_house_user set relation_id = null where id = #{id}")
    Integer delBuildingHousePopulationRelationId(@Param("id") Long id);

    @Select("SELECT " +
            " cmv.`name` AS villageName, " +
            " cmph.id, " +
            " cmv.address, " +
            " cmph.floor, " +
            " cmph.unit_no, " +
            " cmph.house_no  " +
            "FROM " +
            " com_mng_population_house_user AS cmphu " +
            " LEFT JOIN com_mng_population_house AS cmph ON cmph.id = cmphu.house_id " +
            " LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmph.village_id  " +
            "WHERE " +
            " cmphu.popul_id = #{villagePopulationDTO.populationId}")
    IPage<ComMngVillagePopulationHouseListVO> getVillagePopulationHouseAdmin(Page page, @Param("villagePopulationDTO") PageComMngVillagePopulationHouseDTO villagePopulationDTO);

}