From 6750d41c4f75e8fd9ca91e78777ac6e50e5dc292 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 07 Feb 2024 15:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
index ec9819a..8388f12 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
@@ -61,10 +61,12 @@
* @param taskPlaceRectificationDTO 场所整改任务表
* @return 场所整改任务表集合
*/
- public List<TaskPlaceRectificationVO> selectTaskPlaceRectificationList(IPage page,
+ List<TaskPlaceRectificationVO> selectTaskPlaceRectificationList(IPage page,
@Param("taskPalce") TaskPlaceRectificationDTO taskPlaceRectificationDTO,
@Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("nineTypeList") List<String> nineTypeList);
List<Map<String, Object>> getNineTypeStatistics(String code,
List<String> regionChildCodesList,
@@ -73,5 +75,7 @@
List<TaskPlaceRectificationExcel> export(@Param("taskPalce") TaskPlaceRectificationsVO taskPlaceRectification,
@Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("nineTypeList") List<String> nineTypeList);
}
--
Gitblit v1.9.3