Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-03-30 0edab788f512d3c269c6b5caa62682dc1ef396f4

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

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyBelongsVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
import com.panzhihua.service_community.model.dos.ComMngRealCompanyDO;
@@ -74,4 +76,31 @@
            " order by t.create_at desc"+
            "</script>")
    List<ComMngRealCompanyExcelVO> exportRealCompanyExcel(@Param(value = "exportRealCompanyExcelDTO") ExportRealCompanyExcelDTO exportRealCompanyExcelDTO);

    @Select("<script> " +
            " SELECT distinct   " +
            "  act.province_code AS provinceAdcode, " +
            "  act.city_code AS cityAdcode, " +
            "  act.area_code AS districtAdcode, " +
            "  pr.province_name AS provinceName, " +
            "  cty.city_name AS cityName, " +
            "  dis.district_name AS districtName, " +
            "  street.name AS streetName, " +
            "  act.name AS communityName, " +
            "  street.street_id AS streetId, " +
            "  act.community_id AS communityId " +
            " FROM  " +
            "  com_act act " +
            "  LEFT JOIN com_street street ON act.street_id = street.street_id " +
            "  LEFT join com_mng_struct_area_province pr on street.province_code = pr.province_adcode " +
            "  LEFT join com_mng_struct_area_city cty on street.city_code = cty.city_adcode " +
            "  LEFT join com_mng_struct_area_district dis on street.area_code = dis.district_adcode " +
            " WHERE  1=1  " +
            "<if test='pageComMngRealCompanyBelongsDTO.actName != null and pageComMngRealCompanyBelongsDTO.actName.trim() != &quot;&quot;'>" +
            " and  act.name = #{pageComMngRealCompanyBelongsDTO.actName}  " +
            " </if> " +
            " order by act.create_at desc "+
            " limit 1 "+
            "</script>")
    ComMngRealCompanyBelongsVO queryComMngRealCompanyBelongs(@Param(value = "pageComMngRealCompanyBelongsDTO") ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
}