From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.java b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.java
index 49da5f4..2b49773 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.java
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.java
@@ -38,7 +38,16 @@
 	 * @param gridWorkLog
 	 * @return
 	 */
-	List<GridWorkLogVO> selectGridWorkLogPage(IPage page,@Param("gridWorkLog") GridWorkLogVO gridWorkLog);
+	List<GridWorkLogVO> selectGridWorkLogPage(IPage page,
+											  @Param("gridWorkLog") GridWorkLogVO gridWorkLog,
+											  @Param("regionChildCodesList") List<String> regionChildCodesList,
+											  @Param("isAdministrator") Integer isAdministrator);
 
-
+	/**
+	 * 走访日志数量统计
+	 * @param gridCode 网格编号
+	 * @param status 状态
+	 * @return
+	 */
+    Integer getGridWorkCountHandleCount(@Param("gridCode") String gridCode,@Param("status")  Integer status);
 }

--
Gitblit v1.9.3