From cd7bec2448443f88eee6f73df68df829fc95eed9 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 29 六月 2021 11:25:24 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java
index e7e79e8..cae03d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java
@@ -8,7 +8,7 @@
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.visit.AppVisitTasksVO;
-import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.visit.EventVisitListVO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
@@ -42,6 +42,14 @@
* @return
*/
IPage<EventVisitingTasksVO> findListByPage(Page page, @Param("query")EventTasksQuery query);
+
+ /**
+ * appc查看走访任务
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<EventVisitingTasksVO> appFindListByPage(Page page, @Param("query")EventTasksQuery query);
/**
* 查询走访记录，任务
@@ -84,10 +92,10 @@
/**
* 完成走访
- * @param taskCompleteDTO
+ * @param complete
* @return
*/
- Integer complete(EventVisitCompleteDTO taskCompleteDTO);
+ Integer complete(EventVisitingTasksDO complete);
Integer start(EventVisitingTasksDO start);
@@ -95,5 +103,4 @@
Map<String, Object> findUserById(Long userId);
- String getLabel(Long id);
}
--
Gitblit v1.7.1