Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

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

@@ -7,6 +7,7 @@
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.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -26,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);
@@ -55,4 +59,14 @@
            " cmphu.popul_id = #{villagePopulationDTO.populationId}")
    IPage<ComMngVillagePopulationHouseListVO> getVillagePopulationHouseAdmin(Page page, @Param("villagePopulationDTO") PageComMngVillagePopulationHouseDTO villagePopulationDTO);

    @Insert("<script> " +
            "insert into com_mng_population_house_user(`id`,`popul_id`,`house_id`,`relation_id`,`relation`" +
            ",`residence`,`start_at`,`end_at`,`create_at`) values " +
            "<foreach collection=\"houseUserList\" item=\"item\" index=\"index\" separator=\",\">\n" +
            "        (#{item.id},#{item.populId},#{item.houseId},#{item.relationId}" +
            ",#{item.relation},#{item.residence},#{item.startAt},#{item.endAt}" +
            ",now())" +
            "    </foreach>" +
            " </script>")
    void insertAll(@Param("houseUserList") List<ComMngPopulationHouseUserDO> houseUserList);
}