From 14e9e46c441de408616f5ce500623ac1d3d93b5c Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期四, 24 六月 2021 13:55:18 +0800 Subject: [PATCH] Merge branch 'test_visit' into 'test' --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java | 96 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 2 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 f6e3463..437fb74 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 @@ -6,10 +6,21 @@ import com.panzhihua.common.model.dtos.grid.EventVisitingTasksDeleteDTO; import com.panzhihua.common.model.dtos.grid.EventVisitingTasksEditDTO; import com.panzhihua.common.model.dtos.grid.PageEventVisitingTasksDTO; +import com.panzhihua.common.model.query.visit.EventTasksQuery; +import com.panzhihua.common.model.query.visit.EventVisitListQuery; +import com.panzhihua.common.model.vos.IPageVO; import com.panzhihua.common.model.vos.R; -import com.panzhihua.common.model.vos.grid.EventVisitingTasksDetailsVO; -import com.panzhihua.common.model.vos.grid.EventVisitingTasksVO; +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 javax.crypto.BadPaddingException; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.List; /** * 重点人群走访记录 service @@ -57,4 +68,85 @@ R<EventVisitingTasksDetailsVO> eventVisitingTasksDetails(Long id); + /** + * 后台统计走访任务 + * @param communityId + * @return + */ + R count(Long communityId); + + /** + * 走访任务列表 + * @param query + * @return + */ + R taskList(EventTasksQuery query); + + /** + * 删除走访任务 + * @param ids + * @param communityId + * @return + */ + R delete(String ids, Long communityId); + + /** + * 需走访人员列表 + * @param query + * @return + */ + R visitorList(EventVisitListQuery query); + + /** + * app查询走访记录 + * @param query + * @return + */ + R list(EventTasksQuery query); + + /** + * app 走访详情 + * @param id + * @return + */ + R detail(Long id) throws Exception; + + /** + * 新增 + * @param ids + * @param communityId + * @param userId + * @return + */ + R add(String ids, Long communityId, Long userId); + + List<EventVisitingTasksVO> exportTaskList(EventTasksQuery query); + + /** + * 撤销 + * @param id + * @return + */ + R cancel(Long id); + + /** + * 恢复 + * @param id + * @return + */ + R reset(Long id); + + /** + * 开始 + * @param id + * @return + */ + R start(Long id); + + /** + * 完成 + * @param taskCompleteDTO + * @return + */ + R complete(EventVisitCompleteDTO taskCompleteDTO); } -- Gitblit v1.7.1