From 303ee1b7793ec6a70e3b0e41de521e54287be7f7 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 30 六月 2021 09:56:58 +0800
Subject: [PATCH] 修改
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java | 81 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 26 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 4835b17..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,12 +2,14 @@
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.dtos.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;
@@ -74,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);
}
/**
@@ -96,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) throws Exception {
- 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);
}
/**
@@ -117,17 +119,6 @@
return eventVisitingTasksService.list(query);
}
-
- /**
- * app走访任务
- * @param query
- * @return
- */
- @PostMapping("/eventvisitingtasks/appTaskList")
- R appTaskList(@RequestBody EventTasksQuery query){
- return eventVisitingTasksService.appTaskList(query);
- }
-
/**
* 走访任务列表
* @param query
@@ -137,6 +128,18 @@
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);
}
/**
@@ -161,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);
}
/**
@@ -198,4 +201,30 @@
R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO){
return eventVisitingTasksService.complete(taskCompleteDTO);
}
+
+
+ /**
+ * description 获取所有未上传到浪潮平台的走访事件列表
+ *
+ * @return String 事件列表
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @GetMapping("/getUnUploadVisitingTask")
+ List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() {
+ return eventVisitingTasksService.getUnUploadVisitingTask();
+ }
+
+ /**
+ * description 更新走访任务上传是否成功标识
+ *
+ * @param id 事件主键ID
+ * @return Boolean 上传是否成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/updateLcUploadFlagVisitingTask")
+ Boolean updateLcUploadFlagVisitingTask(@RequestParam("id") Long id) {
+ return eventVisitingTasksService.updateLcUploadFlagVisitingTask(id);
+ }
}
--
Gitblit v1.7.1