From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
index 2167243..9a7c00e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
+++ b/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
      */
@@ -119,7 +120,7 @@
      * @param id
      * @return
      */
-    R detail(Long id) throws Exception;
+    R detail(Long id);
 
     /**
      * 新增
@@ -136,18 +137,18 @@
     /**
      * 撤销
      *
-     * @param id
+     * @param idDTO
      * @return
      */
-    R cancel(Long id);
+    R cancel(IdDTO idDTO);
 
     /**
      * 恢复
      *
-     * @param id
+     * @param idDTO
      * @return
      */
-    R reset(Long id);
+    R reset(IdDTO idDTO);
 
     /**
      * 开始
@@ -177,10 +178,17 @@
     /**
      * description 更新上传是否成功标识
      *
-     * @param id 事件主键ID
+     * @param id
+     *            事件主键ID
      * @return Boolean 上传是否成功
      * @author manailin
      * @date 2021/6/10 17:00
      */
     Boolean updateLcUploadFlagVisitingTask(Long id);
+
+    /**
+     * 定时任务-给上月已走访的人员创建定时任务
+     * @return  执行结果
+     */
+    R timedTaskVisitingJobHandler();
 }

--
Gitblit v1.7.1