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

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

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.PageComActDTO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;

import java.util.List;

@@ -42,8 +48,38 @@
            "ORDER BY\n" +
            "distance ASC" +
            "<if test='lng != null and lng.trim() != &quot;&quot;'>" +
            " limit 10 " +
            " limit 100 " +
            " </if> " +
            "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);

    @Select("select district_name from com_mng_struct_area_district where district_adcode=#{areaCode}")
    String selectAreaName(String areaCode);

    @Select("<script> " +
            "SELECT\n" +
            "a.* \n" +
            "FROM\n" +
            "com_act a \n" +
            " <where>" +
            "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != &quot;&quot;'>" +
            "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" +
            " </if> " +
            "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != &quot;&quot;'>" +
            "AND a.area_code = #{pageComActDTO.areaCode} \n" +
            " </if> " +
            "<if test='pageComActDTO.createAtBegin != null '>" +
            "AND a.create_at BETWEEN " +
            "#{pageComActDTO.createAtBegin} \n" +
            "AND #{pageComActDTO.createAtEnd}" +
            " </if> " +
            " </where>" +
            " order by a.create_at desc"+
            "</script>")
    IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);
    @Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id=#{communityId}")
    void updateAccountPassword(@Param("password") String password, @Param("account") String account, @Param("communityId")Long communityId);

    @Select("select community_id,`name` from com_act where state = 0")
    List<EventGridCommunityAdminVO> getCommunityLists();
}