From d97c26f44fe7faa9ab2a2ec3b73d7b0f49140d27 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期三, 29 九月 2021 13:15:03 +0800 Subject: [PATCH] bug修复 --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 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 28aaa37..00a8817 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 @@ -1,17 +1,18 @@ package com.panzhihua.service_grid.service; +import java.util.List; + 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.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.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 java.util.List; /** * 重点人群走访记录 service @@ -58,11 +59,11 @@ /** * 查询重点人群走访记录详细信息 * - * @param id 重点人群走访记录 id + * @param id + * 重点人群走访记录 id * @return 查找结果 */ R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id); - /** * 后台统计走访任务 @@ -73,21 +74,29 @@ R count(Long communityId); /** + * app走访任务 + * + * @param query + * @return + */ + R appTaskList(EventTasksQuery query) throws Exception; + + /** * 走访任务列表 * * @param query * @return */ - R taskList(EventTasksQuery query); + R taskList(EventTasksQuery query) throws Exception; /** * 删除走访任务 * - * @param ids + * @param idDTO * @param communityId * @return */ - R delete(String ids, Long communityId); + R delete(IdDTO idDTO, Long communityId); /** * 需走访人员列表 @@ -111,35 +120,35 @@ * @param id * @return */ - R detail(Long id) throws Exception; + R detail(Long id); /** * 新增 * - * @param ids + * @param idDTO * @param communityId * @param userId * @return */ - R add(String ids, Long communityId, Long userId); + R add(IdDTO idDTO, Long communityId, Long userId) throws Exception; - List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query); + 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); /** * 开始 @@ -169,7 +178,8 @@ /** * description 更新上传是否成功标识 * - * @param id 事件主键ID + * @param id + * 事件主键ID * @return Boolean 上传是否成功 * @author manailin * @date 2021/6/10 17:00 -- Gitblit v1.7.1