From 10df7e29b51d6a2efacc83d870856f57d97a9b66 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 13:48:24 +0800
Subject: [PATCH] #feat 修改别名

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java |   60 ++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 16 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 1d85c71..47c07fe 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
@@ -1,6 +1,11 @@
 package com.panzhihua.service_grid.dao;
 
+import java.util.List;
+import java.util.Map;
 
+import com.panzhihua.common.model.vos.community.ComMngPopulationCommunityTagsVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,14 +13,9 @@
 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.visit.EventVisitingTasksVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Map;
+import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
 
 /**
  * DAO
@@ -24,27 +24,39 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Mapper
 public interface EventVisitingTasksMapper extends BaseMapper<EventVisitingTasksDO> {
 
-           /**
+    /**
      * 统计待走访、已完成、已撤销的任务
+     * 
      * @param communityId
      * @return
      */
-    Map<String, Long> count(@Param("communityId")Long communityId);
+    Map<String, Long> count(@Param("communityId") Long communityId);
 
     /**
      * 后台查询走访记录
+     * 
      * @param page
      * @param query
      * @return
      */
-    IPage<EventVisitingTasksVO> findListByPage(Page page, @Param("query")EventTasksQuery query);
+    IPage<EventVisitingTasksVO> findListByPage(Page page, @Param("query") EventTasksQuery query);
+
+    /**
+     * appc查看走访任务
+     * 
+     * @param page
+     * @param query
+     * @return
+     */
+    IPage<EventVisitingTasksVO> appFindListByPage(Page page, @Param("query") EventTasksQuery query);
 
     /**
      * 查询走访记录,任务
+     * 
      * @param page
      * @param query
      * @return
@@ -53,6 +65,7 @@
 
     /**
      * 需走访人员列表
+     * 
      * @param page
      * @param query
      * @return
@@ -61,13 +74,15 @@
 
     /**
      * 后台根据社区id查询网格员
+     * 
      * @param communityId
      * @return
      */
-    Map<String, Object> findUserByCommunityId(@Param("communityId")Long communityId, @Param("type")int type);
+    Map<String, Object> findUserByCommunityId(@Param("communityId") Long communityId, @Param("type") int type);
 
     /**
      * 根据id查询实有人口
+     * 
      * @param id
      * @return
      */
@@ -75,21 +90,34 @@
 
     /**
      * 统计未完成的走访任务
+     * 
      * @param id
      * @return
      */
     Integer countNoneComplete(Long id);
 
-    Integer updateEventStatus(@Param("id")Long id,@Param("status") Integer status);
+    Integer updateEventStatus(@Param("id") Long id, @Param("status") Integer status);
 
     /**
      * 完成走访
-     * @param taskCompleteDTO
+     * 
+     * @param complete
      * @return
      */
-    Integer complete(EventVisitCompleteDTO taskCompleteDTO);
+    Integer complete(EventVisitingTasksDO complete);
 
-    Integer start(@Param("id")Long id,@Param("status") Integer status);
+    Integer start(EventVisitingTasksDO start);
 
-    Integer cancel(@Param("id")Long id,@Param("status") Integer status);
+    Integer cancel(@Param("id") Long id, @Param("status") Integer status);
+
+    Map<String, Object> findUserById(Long userId);
+
+    String getPopulationLabel(@Param("populationId") Long populationId);
+
+    /**
+     * 根据人口id查询人口在各个社区的标签列表
+     * @param populationId  人口id
+     * @return  人口在各个社区的标签列表
+     */
+    List<ComMngPopulationCommunityTagsVo> getCommunityTagList(@Param("populationId") Long populationId);
 }

--
Gitblit v1.7.1