Merge branch 'test' into 'master'

罗元桥

2021-07-16 151bfa7ab112a0675f4ca48cc414f4398b30cd0d

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

@@ -6,9 +6,7 @@
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.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComMngRealCompanyDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -88,7 +86,8 @@
            "  street.name AS streetName, " +
            "  act.name AS communityName, " +
            "  street.street_id AS streetId, " +
            "  act.community_id AS communityId " +
            "  act.community_id AS communityId, " +
            "  act.create_at AS creatAt " +
            " FROM  " +
            "  com_act act " +
            "  LEFT JOIN com_street street ON act.street_id = street.street_id " +
@@ -103,4 +102,7 @@
            " limit 1 " +
            "</script>")
    ComMngRealCompanyBelongsVO queryComMngRealCompanyBelongs(@Param(value = "pageComMngRealCompanyBelongsDTO") ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);

    @Select("select count(id) as companyTotal from com_mng_real_company where community_id = #{communityId}")
    ComMngRealCompanyTotalVO getComMngRealCompanyTotalByAdmin(@Param("communityId") Long communityId);
}