Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-06 a18634e047b46e411dac268a0b3a995c22053ea5

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

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

import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.elders.ComEldersAuthHistoryVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -13,10 +16,6 @@
import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
import com.panzhihua.common.model.vos.community.ComEldersAuthRecordForCommunityVO;
import com.panzhihua.common.model.vos.community.ComEldersAuthRecordVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;

@@ -149,4 +148,8 @@
    IPage<ComEldersAuthRecordForCommunityVO> selectCommunityEldersRecordByPage(Page page,
        @Param("pageEldersAuthRecordDTO") PageEldersAuthRecordDTO pageEldersAuthRecordDTO);

    Map<String,String> getEldersAuthStatistics(@Param("communityId") Long communityId);

    List<ComEldersAuthHistoryVO> getEldersAuthRecords(@Param("communityId") Long communityId);

}