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/ComCvtBusinessDAO.java

@@ -3,6 +3,7 @@
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.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.service_community.model.dos.ComCvtBusinessDO;
@@ -15,12 +16,14 @@

    @Select("<script> " +
            "SELECT " +
            "a.*  " +
            "a.*,  " +
            "IF(u.type=2,CONCAT('运营平台(',u.account,')'),CONCAT('社区平台(',u.account,')'))  create_by_name " +
            "FROM " +
            "com_cvt_business a  " +
            "LEFT JOIN sys_user u ON a.create_by = u.user_id "+
            " <where>" +
            "<if test='pageComCvtBusinessDTO.name != null and pageComCvtBusinessDTO.name.trim() != &quot;&quot;'>" +
            " and a.name LIKE concat( #{pageComCvtBusinessDTO.name}, '%' )  " +
            " and a.name LIKE concat( '%', #{pageComCvtBusinessDTO.name}, '%' )  " +
            " </if> " +
            "<if test='pageComCvtBusinessDTO.communityId != null and pageComCvtBusinessDTO.communityId != 0'>" +
            " and a.community_id = #{pageComCvtBusinessDTO.communityId} " +
@@ -29,4 +32,24 @@
            " order by a.create_at desc"+
            "</script>")
    IPage<ComCvtBusinessVO> pageComCvtBusiness(Page page, @Param("pageComCvtBusinessDTO") PageComCvtBusinessDTO pageComCvtBusinessDTO);


    @Select("<script> " +
            "SELECT " +
            "t.*  " +
            "FROM " +
            "com_cvt_business t  " +
            " <where>" +
            "<if test='comCvtBusinessAppletsDTO.communityId != null and comCvtBusinessAppletsDTO.communityId != 0'>" +
            " t.area_flag = 1 " +
            " OR (" +
            " t.area_flag = 2 " +
            " AND EXISTS ( SELECT * FROM com_cvt_business_area t2 WHERE t2.business_id = t.id AND t2.community_id = #{comCvtBusinessAppletsDTO.communityId} ) \n" +
            " ) " +
            " </if> " +
            " </where>" +
            " order by t.create_at desc"+
            "</script>")
    IPage<ComCvtBusinessVO> pageComCvtBusinessByServiceArea(Page page, @Param("comCvtBusinessAppletsDTO") PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);

}