From b2a62864b8367c80921c9df7614dd3b6c667801b Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 28 六月 2021 15:54:22 +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/api/EventVisitingTasksApi.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
index 54c36ab..33094c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
@@ -5,14 +5,12 @@
 import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
 import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO;
 import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
+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.vos.grid.EventDetailsVO;
-import com.panzhihua.common.model.vos.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 com.panzhihua.service_grid.service.EventVisitingTasksService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -132,6 +130,18 @@
     }
 
     /**
+     * app走访任务列表
+     * @param query
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/appTaskList")
+    R appTaskList(@RequestBody EventTasksQuery query) throws Exception {
+
+        return eventVisitingTasksService.appTaskList(query);
+    }
+
+    /**
      * 导出
      * @param query
      * @return

--
Gitblit v1.7.1