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/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java | 153 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 130 insertions(+), 23 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 911580a..3c617ef 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,18 +2,20 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO;
import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO;
+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.EventVisitingTasksDetailsVO;
-import com.panzhihua.common.model.vos.grid.EventVisitingTasksVO;
+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.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
*
@@ -31,14 +33,14 @@
private EventVisitingTasksService eventVisitingTasksService;
/**
- * 新增重点人群走访记录
- * @param eventVisitingTasksAddDTO
- * @return 新增结果
+ * 统计走访任务
+ * @param communityId
+ * @return
*/
- @PostMapping("/add")
- R add(@RequestBody EventVisitingTasksAddDTO eventVisitingTasksAddDTO){
- return eventVisitingTasksService.add(eventVisitingTasksAddDTO);
- };
+ @GetMapping("/count")
+ R count(@RequestParam("communityId") Long communityId){
+ return eventVisitingTasksService.count(communityId);
+ }
/**
* 修改重点人群走访记录
@@ -48,7 +50,7 @@
@PostMapping("/edit")
R edit(@RequestBody EventVisitingTasksEditDTO eventVisitingTasksEditDTO){
return eventVisitingTasksService.edit(eventVisitingTasksEditDTO);
- };
+ }
/**
* 分页查找重点人群走访记录
@@ -58,17 +60,8 @@
@PostMapping("/page")
R<IPage<EventVisitingTasksVO>> query(@RequestBody PageEventVisitingTasksDTO pageEventVisitingTasksDTO){
return eventVisitingTasksService.query(pageEventVisitingTasksDTO);
- };
+ }
- /**
- * 删除重点人群走访记录
- * @param EventVisitingTasksDeleteDTO
- * @return 平台用户信息
- */
- @PostMapping("/delete")
- R delete(@RequestBody EventVisitingTasksDeleteDTO EventVisitingTasksDeleteDTO){
- return eventVisitingTasksService.delete(EventVisitingTasksDeleteDTO);
- };
/**
* 查询重点人群走访记录详细信息
@@ -78,6 +71,120 @@
@PostMapping("/{id}")
R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(@PathVariable("id") Long id){
return eventVisitingTasksService.eventVisitingTasksDetails(id);
- };
+ }
+ /**
+ * 删除走访任务
+ * @param ids
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/delete")
+ R delete(@RequestParam("ids") String ids, @RequestParam("communityId") Long communityId){
+ return eventVisitingTasksService.delete(ids,communityId);
+ }
+ /**
+ * 需走访人员列表
+ * @param query
+ * @return
+ */
+ @PostMapping("/visitorList")
+ R visitorList(@RequestBody EventVisitListQuery query){
+
+ return eventVisitingTasksService.visitorList(query);
+ }
+
+ /**
+ * 新增走访任务
+ * @param ids
+ * @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);
+ }
+
+ /**
+ * 走访记录
+ * @param query
+ * @return
+ */
+ @PostMapping("/list")
+ R list(@RequestBody EventTasksQuery query){
+
+ return eventVisitingTasksService.list(query);
+ }
+
+ /**
+ * 走访任务列表
+ * @param query
+ * @return
+ */
+ @PostMapping("/taskList")
+ R taskList(@RequestBody EventTasksQuery query){
+
+ return eventVisitingTasksService.taskList(query);
+ }
+
+ /**
+ * 导出
+ * @param query
+ * @return
+ */
+ @PostMapping("/exportTaskList")
+ List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query){
+ return eventVisitingTasksService.exportTaskList(query);
+ }
+
+ /**
+ * app走访详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/detail/{id}")
+ R detail(@PathVariable("id") Long id) throws Exception {
+ return eventVisitingTasksService.detail(id);
+ }
+
+ /**
+ * 撤销走访
+ * @param id
+ * @return
+ */
+ @PostMapping("/cancel/{id}")
+ R cancel(@PathVariable("id") Long id){
+ return eventVisitingTasksService.cancel(id);
+ }
+
+ /**
+ * 恢复
+ * @param id
+ * @return
+ */
+ @PostMapping("/reset/{id}")
+ R reset(@PathVariable("id") Long id){
+ return eventVisitingTasksService.reset(id);
+ }
+
+ /**
+ * 开始走访
+ * @param id
+ * @return
+ */
+ @PostMapping("/start")
+ R start(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
+ return eventVisitingTasksService.start(id,userId);
+ }
+
+ /**
+ * 完成走访记录
+ * @param taskCompleteDTO
+ * @return
+ */
+ @PostMapping("/complete")
+ R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO){
+ return eventVisitingTasksService.complete(taskCompleteDTO);
+ }
}
--
Gitblit v1.7.1