From cf2e6ce54f82c61606a01f816f7cac8b3a967809 Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期三, 30 六月 2021 18:07:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java index fa6d7b6..68d6a5d 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.panzhihua.common.model.dtos.IdDTO; import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.query.visit.EventTasksQuery; import com.panzhihua.common.model.query.visit.EventVisitListQuery; @@ -90,11 +91,11 @@ /** * 删除走访任务 * - * @param ids + * @param idDTO * @param communityId * @return */ - R delete(String ids, Long communityId); + R delete(IdDTO idDTO, Long communityId); /** * 需走访人员列表 @@ -123,30 +124,30 @@ /** * 新增 * - * @param ids + * @param idDTO * @param communityId * @param userId * @return */ - R add(String ids, Long communityId, Long userId) throws Exception; + R add(IdDTO idDTO, Long communityId, Long userId) throws Exception; List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query) throws Exception; /** * 撤销 * - * @param id + * @param idDTO * @return */ - R cancel(Long id); + R cancel(IdDTO idDTO); /** * 恢复 * - * @param id + * @param idDTO * @return */ - R reset(Long id); + R reset(IdDTO idDTO); /** * 开始 -- Gitblit v1.7.1