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

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

import java.util.Map;

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

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

import java.util.Map;

/**
 * @auther txb
@@ -22,16 +22,19 @@

    /**
     * 分页查询巡查记录
     * @param comSwPatrolRecordPageDTO 查询参数
     * 
     * @param comSwPatrolRecordPageDTO
     *            查询参数
     * @return 分页集合
     */
    IPage<ComSwPatrolRecordVO> pagePatrolRecord(Page page, @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);
    IPage<ComSwPatrolRecordVO> pagePatrolRecord(Page page,
        @Param("comSwPatrolRecordDTO") ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    Map<String,String> getPbServiceTeamById(@Param("teamId") String teamId);
    Map<String, String> getPbServiceTeamById(@Param("teamId") String teamId);

    Map<String,Object> getPbServiceTeamCardNo(@Param("userId") String userId);
    Map<String, Object> getPbServiceTeamCardNo(@Param("userId") String userId);

    String getCreateName(@Param("userId") Long userId);

    Map<String,String> getPatrolPersonName(@Param("dangerId") Long dangerId);
    Map<String, String> getPatrolPersonName(@Param("dangerId") Long dangerId);
}