From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/mapper/TaskMapper.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
index fb1a047..467ea01 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
@@ -42,7 +42,8 @@
 	List<TaskVO> selectTaskPage(IPage page,
 								@Param("task") TaskVO task,
 								@Param("regionChildCodesList") List<String> regionChildCodesList,
-								@Param("isAdministrator") Integer isAdministrator);
+								@Param("isAdministrator") Integer isAdministrator,
+								@Param("gridCodeList") List<String> gridCodeList);
 
 	List<TaskVO> selectTaskPageBy(IPage page,
 								  @Param("task") TaskVO task,
@@ -53,4 +54,18 @@
 
 
 	List<TaskVO> getBailReportingPage(IPage<TaskVO> page, TaskVO task);
+
+	/**
+	 * 查询取保候审任务列表(人房相关)
+	 * @param page
+	 * @param task
+	 * @param regionChildCodesList
+	 * @param isAdministrator
+	 * @return
+	 */
+	List<TaskVO> selectTaskPageByPerson(IPage<TaskVO> page,
+										@Param("task") TaskVO task,
+										@Param("regionChildCodesList") List<String> regionChildCodesList,
+										@Param("isAdministrator") Integer isAdministrator,
+										@Param("gridCodeList") List<String> gridCodeList);
 }

--
Gitblit v1.9.3