From b7a06b6e93c0df03ed84c40385cbe88d27459d4f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 09 七月 2021 13:27:48 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java |   49 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 19 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 a645d23..4dcd2a2 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
@@ -2,17 +2,16 @@
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.panzhihua.common.model.dtos.IdDTO;
 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.*;
@@ -77,13 +76,13 @@
     }
     /**
      * 删除走访任务
-     * @param ids
+     * @param idDTO
      * @param communityId
      * @return
      */
     @PostMapping("/delete")
-    R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId){
-        return eventVisitingTasksService.delete(ids,communityId);
+    R delete(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId){
+        return eventVisitingTasksService.delete(idDTO,communityId);
     }
 
     /**
@@ -99,14 +98,14 @@
 
     /**
      * 新增走访任务
-     * @param ids
+     * @param idDTO
      * @param communityId
      * @param userId
      * @return
      */
     @PostMapping("/add")
-    R add(@RequestParam("ids") String ids,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){
-        return eventVisitingTasksService.add(ids,communityId,userId);
+    R add(@RequestBody IdDTO idDTO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) throws Exception {
+        return eventVisitingTasksService.add(idDTO,communityId,userId);
     }
 
     /**
@@ -126,9 +125,21 @@
      * @return
      */
     @PostMapping("/taskList")
-    R taskList(@RequestBody EventTasksQuery query){
+    R taskList(@RequestBody EventTasksQuery query) throws Exception {
 
         return eventVisitingTasksService.taskList(query);
+    }
+
+    /**
+     * app走访任务列表
+     * @param query
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/appTaskList")
+    R appTaskList(@RequestBody EventTasksQuery query) throws Exception {
+
+        return eventVisitingTasksService.appTaskList(query);
     }
 
     /**
@@ -137,7 +148,7 @@
      * @return
      */
     @PostMapping("/exportTaskList")
-    List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query){
+    List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query) throws Exception {
         return eventVisitingTasksService.exportTaskList(query);
     }
 
@@ -153,22 +164,22 @@
 
     /**
      * 撤销走访
-     * @param id
+     * @param idDTO
      * @return
      */
-    @PostMapping("/cancel/{id}")
-    R cancel(@PathVariable("id") Long id){
-        return eventVisitingTasksService.cancel(id);
+    @PostMapping("/cancel")
+    R cancel(@RequestBody IdDTO idDTO){
+        return eventVisitingTasksService.cancel(idDTO);
     }
 
     /**
      * 恢复
-     * @param id
+     * @param idDTO
      * @return
      */
-    @PostMapping("/reset/{id}")
-    R reset(@PathVariable("id") Long id){
-        return eventVisitingTasksService.reset(id);
+    @PostMapping("/reset")
+    R reset(@RequestBody IdDTO idDTO){
+        return eventVisitingTasksService.reset(idDTO);
     }
 
     /**

--
Gitblit v1.7.1