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/service/EventVisitingTasksService.java

@@ -1,18 +1,18 @@
package com.panzhihua.service_grid.service;

import java.util.List;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.IdDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksDetailsVO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;

import java.util.List;

/**
 * 重点人群走访记录 service
@@ -59,11 +59,11 @@
    /**
     * 查询重点人群走访记录详细信息
     *
     * @param id 重点人群走访记录 id
     * @param id
     *            重点人群走访记录 id
     * @return 查找结果
     */
    R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id);


    /**
     * 后台统计走访任务
@@ -75,6 +75,7 @@

    /**
     * app走访任务
     * 
     * @param query
     * @return
     */
@@ -177,7 +178,8 @@
    /**
     * description 更新上传是否成功标识
     *
     * @param id 事件主键ID
     * @param id
     *            事件主键ID
     * @return Boolean 上传是否成功
     * @author manailin
     * @date 2021/6/10 17:00