From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
index b7bbe4d..6556f92 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.api.EventInfo;
import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.serviceapi.model.dto.LcFlowPersonVisitRecordDTO;
-import com.panzhihua.serviceapi.model.dto.LcGridData;
-import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordDTO;
-import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordQueryDTO;
+import com.panzhihua.serviceapi.model.dto.*;
import java.util.List;
@@ -80,17 +77,27 @@
* @author manailin
* @date 2021/6/10 17:00
*/
- List<LcGridData> getGridListByAreaId(String areaId);
+ List<LcGridData> getGridTreeByAreaId(String areaId);
+ /**
+ * description 获取指定区域网格列表,直接返回网格列表
+ *
+ * @param areaId 区域ID
+ * @return String 事件信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ List<LcGridData> getGridDataListByAreaId(String areaId);
/**
* description 获取所有或者根据姓名和工号查询,分页
*
* @param areaId 区域ID
+ * @param param 姓名或者工号
* @return String 网格员列表
* @author manailin
* @date 2021/6/10 17:00
*/
- String getGridMemberListByAreaIdOrName(String areaId);
+ List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param,Long pageNum,Long pageSize);
/**
* description 提交事件登记关联的文件或者图片信息
--
Gitblit v1.7.1