From 05bd97aab35b27be282fd45d013e1330edda2cc0 Mon Sep 17 00:00:00 2001 From: xyh <18782104331@139.com> Date: 星期二, 29 六月 2021 16:21:53 +0800 Subject: [PATCH] 修复bug-401-【综治后台管理--事件管理】搜索事件功能未生效 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 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 54c36ab..c869ab3 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) 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); } /** @@ -132,6 +131,18 @@ } /** + * app走访任务列表 + * @param query + * @return + * @throws Exception + */ + @PostMapping("/appTaskList") + R appTaskList(@RequestBody EventTasksQuery query) throws Exception { + + return eventVisitingTasksService.appTaskList(query); + } + + /** * 导出 * @param query * @return -- Gitblit v1.7.1