From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 ac3f42a..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,13 +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 gridId 网格id
+ * @param gridCode 网格编号
* @param status 状态
* @return
*/
- Integer getGridWorkCountHandleCount(@Param("gridId") Integer gridId,@Param("status") Integer status);
+ Integer getGridWorkCountHandleCount(@Param("gridCode") String gridCode,@Param("status") Integer status);
}
--
Gitblit v1.9.3