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/task/mapper/TaskReportForRepairsMapper.java | 12 +++++++++---
1 files changed, 9 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 a8118ba..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,7 +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("aoiCodeList") List<String> aoiCodeList,
+ @Param("gridCodeList") List<String> gridCodeList);
/**
@@ -52,9 +55,12 @@
* @param userId
* @return
*/
- TaskReportStatistics getStatisticsCount(@Param("userId") Long userId, @Param("houseCode") String houseCode, @Param("neiCode") String neiCode);
+ TaskReportStatistics getStatisticsCount(@Param("userId") Long userId,
+ @Param("houseCode") String houseCode,
+ @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