From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 2f63c16..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,11 +2,12 @@
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;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.dtos.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;
@@ -73,6 +74,13 @@
R count(Long communityId);
/**
+ * app走访任务
+ * @param query
+ * @return
+ */
+ R appTaskList(EventTasksQuery query) throws Exception;
+
+ /**
* 走访任务列表
*
* @param query
@@ -83,11 +91,11 @@
/**
* 删除走访任务
*
- * @param ids
+ * @param idDTO
* @param communityId
* @return
*/
- R delete(String ids, Long communityId);
+ R delete(IdDTO idDTO, Long communityId);
/**
* 需走访人员列表
@@ -116,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