From 14e9e46c441de408616f5ce500623ac1d3d93b5c Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期四, 24 六月 2021 13:55:18 +0800 Subject: [PATCH] Merge branch 'test_visit' into 'test' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 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 131f463..bf2eca9 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.*; @@ -948,4 +952,107 @@ */ @GetMapping("/event/updateLcUploadFlag") Boolean updateLcUploadFlag(@RequestParam("id")Long id); + + + /** + * 后台统计走访任务 + * @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); + + /** + * 完成走访记录 + * @param taskCompleteDTO + * @return + */ + @PostMapping("/eventvisitingtasks/complete") + R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO); } -- Gitblit v1.7.1