Merge branch 'test' into 'master'

罗元桥

2021-06-30 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
@@ -16,6 +17,7 @@
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.index.*;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.common.model.vos.grid.EventSpecialPopulationVO;
import com.panzhihua.common.model.vos.grid.PopulationDetailVO;
import com.panzhihua.common.model.vos.grid.PopulationListVO;
import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO;
@@ -950,7 +952,7 @@
            "AND cmp.house_id is null " +
            " </if> " +
            "<if test='populationListDTO.communityId != null'>" +
            "AND cmp.community_id = #{populationListDTO.communityId} " +
            "AND cmp.act_id = #{populationListDTO.communityId} " +
            " </if> " +
            "<if test='populationListDTO.politicalOutlook != null'>" +
            "AND cmp.political_outlook = #{populationListDTO.politicalOutlook} " +
@@ -965,4 +967,30 @@
    @Select("select relation from com_mng_population_house_user where house_id = #{houseId} and popul_id = #{populationId}")
    Integer getPopulationRelationByHouseId(@Param("houseId") Long houseId, @Param("populationId") Long populationId);

    @Select("<script>" +
            " select count(id) from event_visiting_tasks as evt where visiter_id in " +
            "<foreach collection='ids' item='id' index='index' open='(' close=')' separator=',' >" +
            "#{id}" +
            "</foreach>" +
            " </script>")
    Integer getPopulationVisitingCount(@Param("ids") List<Long> ids);

    @Select("<script> " +
            "SELECT " +
            "   cmp.id, " +
            "   cmp.`name`, " +
            "   cmp.card_no as idCard, " +
            "   cmp.label, " +
            "   cmp.sex, " +
            "   IFNULL( cmp.phone, '暂无' ) as phone, " +
            "   cmp.address, " +
            "   cmp.political_outlook " +
            "  FROM " +
            "   com_mng_population AS cmp where 1=1 " +
            "<if test='populationDTO.keyWord != null'>" +
            " AND (cmp.name like concat(#{populationDTO.keyWord},'%') or cmp.card_no_str like concat(#{populationDTO.keyWord},'%')) " +
            " </if> " +
            " </script>")
    IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO);

}