From 784a24a80896f2a31cba72887b75d30bf0f645da Mon Sep 17 00:00:00 2001 From: xyh <18782104331@139.com> Date: 星期一, 28 六月 2021 10:12:45 +0800 Subject: [PATCH] 合并代码 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 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 a645d23..1281aef 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 @@ -5,14 +5,12 @@ 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.*; @@ -105,7 +103,7 @@ * @return */ @PostMapping("/add") - R add(@RequestParam("ids") String ids,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){ + R add(@RequestParam("ids") String ids,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId) throws Exception { return eventVisitingTasksService.add(ids,communityId,userId); } @@ -126,7 +124,7 @@ * @return */ @PostMapping("/taskList") - R taskList(@RequestBody EventTasksQuery query){ + R taskList(@RequestBody EventTasksQuery query) throws Exception { return eventVisitingTasksService.taskList(query); } @@ -137,7 +135,7 @@ * @return */ @PostMapping("/exportTaskList") - List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query){ + List<EventVisitingTasksVO> exportTaskList(@RequestBody EventTasksQuery query) throws Exception { return eventVisitingTasksService.exportTaskList(query); } -- Gitblit v1.7.1