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

@@ -1,20 +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.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO;
import com.panzhihua.common.model.vos.community.ComSwRotaVO;
import com.panzhihua.service_community.model.dos.ComSwRotaDO;
import java.util.Map;

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

import java.util.List;

import java.util.Map;
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.ComSwRotaPageDTO;
import com.panzhihua.common.model.vos.community.ComSwRotaVO;
import com.panzhihua.service_community.model.dos.ComSwRotaDO;

/**
 * @auther txb
@@ -26,17 +22,22 @@

    /**
     * 分页查询值班表
     * @param comSwRotaPageDTO 查询参数
     * 
     * @param comSwRotaPageDTO
     *            查询参数
     * @return 值班表分页集合
     */
    IPage<ComSwRotaVO> pageRota(Page page, @Param("comSwRotaPageDTO") ComSwRotaPageDTO comSwRotaPageDTO);

    /**
     * 根据电话查询teamId
     * @param teamPhone 查询参数
     * 
     * @param teamPhone
     *            查询参数
     * @return teamId
     */
    String getTeamIdsByTeamPhone(@Param("teamPhone") String teamPhone);
    Map<String,String> getImageUrl(@Param("userId") Long userId);

    Map<String, String> getImageUrl(@Param("userId") Long userId);

}