Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,15 +1,16 @@
package com.panzhihua.service_community.dao;

import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

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.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.service_community.model.dos.ComMngStructOtherBuildDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -20,48 +21,28 @@
@Mapper
public interface ComMngStructOtherBuildDAO extends BaseMapper<ComMngStructOtherBuildDO> {

    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
    @Select("<script> " +
            "SELECT \n" +
            "b.id,\n" +
            "b.`name`,\n" +
            "t.name buileTypeName,\n" +
            "b.square,\n" +
            "b.address,\n" +
            "b.`state`,\n" +
            "b.layer_type,\n" +
            "b.create_at\n" +
            "FROM\n" +
            "com_mng_struct_other_build b \n" +
            "join com_mng_struct_build_type t on b.type_id=t.id\n" +
            " <where>" +
            "<if test='comMngStructOtherBuildVO.name != null and comMngStructOtherBuildVO.name.trim() != &quot;&quot;'>" +
            " and b.name like concat(#{comMngStructOtherBuildVO.name},'%') "+
            " </if> " +
            "<if test='comMngStructOtherBuildVO.communityId != null'>" +
            " and b.community_id = #{comMngStructOtherBuildVO.communityId} "+
            " </if> " +
            " </where>" +
            " order by b.create_at desc" +
            "</script>")
    IPage<ComMngStructOtherBuildVO> pageOtherBuild(Page page, @Param("comMngStructOtherBuildVO") ComMngStructOtherBuildVO comMngStructOtherBuildVO);
    // @Select("<script> " +
    // " <where>" +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // " </where>" +
    // "</script>")
    @Select("<script> " + "SELECT \n" + "b.id,\n" + "b.`name`,\n" + "t.name buileTypeName,\n" + "b.square,\n"
        + "b.address,\n" + "b.`state`,\n" + "b.layer_type,\n" + "b.create_at\n" + "FROM\n"
        + "com_mng_struct_other_build b \n" + "join com_mng_struct_build_type t on b.type_id=t.id\n" + " <where>"
        + "<if test='comMngStructOtherBuildVO.name != null and comMngStructOtherBuildVO.name.trim() != &quot;&quot;'>"
        + " and b.name like concat(#{comMngStructOtherBuildVO.name},'%') " + " </if> "
        + "<if test='comMngStructOtherBuildVO.communityId != null'>"
        + " and b.community_id = #{comMngStructOtherBuildVO.communityId} " + " </if> " + " </where>"
        + " order by b.create_at desc" + "</script>")
    IPage<ComMngStructOtherBuildVO> pageOtherBuild(Page page,
        @Param("comMngStructOtherBuildVO") ComMngStructOtherBuildVO comMngStructOtherBuildVO);

    @Select("SELECT\n" +
            "b.type_id \n" +
            "FROM\n" +
            "com_mng_struct_other_build b\n" +
            "WHERE\n" +
            "b.community_id = #{communityId}\n" +
            "GROUP BY\n" +
            "b.type_id")
    @Select("SELECT\n" + "b.type_id \n" + "FROM\n" + "com_mng_struct_other_build b\n" + "WHERE\n"
        + "b.community_id = #{communityId}\n" + "GROUP BY\n" + "b.type_id")
    List<Long> selectAllBuildTypeIds(Long communityId);
}