From eb0e0847f4030ec96d18ab0e632aa1668ff6126d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 24 六月 2021 16:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_esay_photo' into test_esay_photo

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java |   83 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 75 insertions(+), 8 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 b979669..e7e79e8 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
@@ -5,11 +5,17 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.visit.AppVisitTasksVO;
+import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
+import com.panzhihua.common.model.vos.visit.EventVisitListVO;
 import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
-import com.panzhihua.common.model.vos.grid.EventVisitingTasksVO;
+import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * DAO
@@ -22,11 +28,72 @@
 @Mapper
 public interface EventVisitingTasksMapper extends BaseMapper<EventVisitingTasksDO> {
 
-        /**
-         * 分页查询
-         * @param pageEventVisitingTasksDTO
-         * @return
-         */
-        IPage<EventVisitingTasksVO> findByPage(Page page, @Param("pageEventVisitingTasksDTO")PageEventVisitingTasksDTO pageEventVisitingTasksDTO);
+           /**
+     * 统计待走访、已完成、已撤销的任务
+     * @param communityId
+     * @return
+     */
+    Map<String, Long> count(@Param("communityId")Long communityId);
 
+    /**
+     * 后台查询走访记录
+     * @param page
+     * @param query
+     * @return
+     */
+    IPage<EventVisitingTasksVO> findListByPage(Page page, @Param("query")EventTasksQuery query);
+
+    /**
+     * 查询走访记录，任务
+     * @param page
+     * @param query
+     * @return
+     */
+    IPage<AppVisitTasksVO> list(Page page, @Param("query") EventTasksQuery query);
+
+    /**
+     * 需走访人员列表
+     * @param page
+     * @param query
+     * @return
+     */
+    IPage<EventVisitListVO> visitorList(Page page, @Param("query") EventVisitListQuery query);
+
+    /**
+     * 后台根据社区id查询网格员
+     * @param communityId
+     * @return
+     */
+    Map<String, Object> findUserByCommunityId(@Param("communityId")Long communityId, @Param("type")int type);
+
+    /**
+     * 根据id查询实有人口
+     * @param id
+     * @return
+     */
+    Map<String, Object> findPopulationById(Long id);
+
+    /**
+     * 统计未完成的走访任务
+     * @param id
+     * @return
+     */
+    Integer countNoneComplete(Long id);
+
+    Integer updateEventStatus(@Param("id")Long id,@Param("status") Integer status);
+
+    /**
+     * 完成走访
+     * @param taskCompleteDTO
+     * @return
+     */
+    Integer complete(EventVisitCompleteDTO taskCompleteDTO);
+
+    Integer start(EventVisitingTasksDO start);
+
+    Integer cancel(@Param("id")Long id,@Param("status") Integer status);
+
+    Map<String, Object> findUserById(Long userId);
+
+    String getLabel(Long id);
 }

--
Gitblit v1.7.1