From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
index 521075a..0632e64 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java
@@ -43,9 +43,10 @@
*/
List<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage page,
@Param("vo") TaskReportForRepairsVO taskReportForRepairs,
- @Param("list") List<String> list,
@Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("aoiCodeList") List<String> aoiCodeList,
+ @Param("gridCodeList") List<String> gridCodeList);
/**
@@ -59,7 +60,7 @@
@Param("regionChildCodesList") List<String> regionChildCodesList,
@Param("isAdministrator") Integer isAdministrator);
- Integer getStatistics(Long userId,String neiCode);
+ Integer getStatistics(Long userId, String neiCode, String roleName);
/**
* 更新状态--临时接口
--
Gitblit v1.9.3