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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java

@@ -1,6 +1,9 @@
package com.panzhihua.service_grid.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;
@@ -8,14 +11,9 @@
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.visit.AppVisitTasksVO;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.visit.EventVisitListVO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.Map;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;

/**
 * DAO
@@ -24,35 +22,39 @@
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 * */
 */
@Mapper
public interface EventVisitingTasksMapper extends BaseMapper<EventVisitingTasksDO> {

           /**
    /**
     * 统计待走访、已完成、已撤销的任务
     * 
     * @param communityId
     * @return
     */
    Map<String, Long> count(@Param("communityId")Long communityId);
    Map<String, Long> count(@Param("communityId") Long communityId);

    /**
     * 后台查询走访记录
     * 
     * @param page
     * @param query
     * @return
     */
    IPage<EventVisitingTasksVO> findListByPage(Page page, @Param("query")EventTasksQuery query);
    IPage<EventVisitingTasksVO> findListByPage(Page page, @Param("query") EventTasksQuery query);

    /**
     * appc查看走访任务
     * 
     * @param page
     * @param query
     * @return
     */
    IPage<EventVisitingTasksVO> appFindListByPage(Page page, @Param("query")EventTasksQuery query);
    IPage<EventVisitingTasksVO> appFindListByPage(Page page, @Param("query") EventTasksQuery query);

    /**
     * 查询走访记录，任务
     * 
     * @param page
     * @param query
     * @return
@@ -61,6 +63,7 @@

    /**
     * 需走访人员列表
     * 
     * @param page
     * @param query
     * @return
@@ -69,13 +72,15 @@

    /**
     * 后台根据社区id查询网格员
     * 
     * @param communityId
     * @return
     */
    Map<String, Object> findUserByCommunityId(@Param("communityId")Long communityId, @Param("type")int type);
    Map<String, Object> findUserByCommunityId(@Param("communityId") Long communityId, @Param("type") int type);

    /**
     * 根据id查询实有人口
     * 
     * @param id
     * @return
     */
@@ -83,15 +88,17 @@

    /**
     * 统计未完成的走访任务
     * 
     * @param id
     * @return
     */
    Integer countNoneComplete(Long id);

    Integer updateEventStatus(@Param("id")Long id,@Param("status") Integer status);
    Integer updateEventStatus(@Param("id") Long id, @Param("status") Integer status);

    /**
     * 完成走访
     * 
     * @param complete
     * @return
     */
@@ -99,7 +106,7 @@

    Integer start(EventVisitingTasksDO start);

    Integer cancel(@Param("id")Long id,@Param("status") Integer status);
    Integer cancel(@Param("id") Long id, @Param("status") Integer status);

    Map<String, Object> findUserById(Long userId);