From eb0e0847f4030ec96d18ab0e632aa1668ff6126d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 24 六月 2021 16:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_esay_photo' into test_esay_photo

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java |  106 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 106 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index 0e87c1b..7d23ba4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -2,8 +2,12 @@
 
 import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
 import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.query.visit.EventTasksQuery;
+import com.panzhihua.common.model.query.visit.EventVisitListQuery;
 import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.grid.*;
+import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -956,4 +960,106 @@
      */
     @GetMapping("/screen/work/event")
     R eventWork(@RequestParam("communityId")Long communityId);
+
+    /**
+     *  后台统计走访任务
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/eventvisitingtasks/count")
+    R countVisit(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 查询走访记录
+     * @param query
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/list")
+    R list(@RequestBody EventTasksQuery query);
+
+    /**
+     * 走访任务列表
+     * @param query
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/taskList")
+    R taskList(@RequestBody EventTasksQuery query);
+
+    /**
+     * 导出
+     * @param query
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/exportTaskList")
+    List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query);
+
+    /**
+     * 删除走访任务
+     * @param ids
+     * @param communityId
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/delete")
+    R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId);
+
+    /**
+     * 被走访人员列表
+     * @param query
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/visitorList")
+    R visitorList(@RequestBody EventVisitListQuery query);
+
+
+
+    /**
+     * 走访详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/eventvisitingtasks/detail/{id}")
+    R detail(@PathVariable("id") Long id);
+
+
+    /**
+     * 撤销走访
+     * @param id
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/cancel/{id}")
+    R cancel(@PathVariable("id") Long id);
+
+    /**
+     * 恢复走访
+     * @param id
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/reset/{id}")
+    R reset(@PathVariable("id") Long id);
+
+    /**
+     * 新增走访
+     * @param ids
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/add")
+    R addVisitingTask(@RequestParam("ids") String ids,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);
+
+    /**
+     * 开始走访
+     * @param id
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/start")
+    R start(@RequestParam("id")Long id,@RequestParam("userId")Long userId);
+
+    /**
+     * 完成走访记录
+     * @param taskCompleteDTO
+     * @return
+     */
+    @PostMapping("/eventvisitingtasks/complete")
+    R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO);
 }

--
Gitblit v1.7.1