diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java b/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java index c59aa0a2..0b799660 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java @@ -112,8 +112,9 @@ public class FishDraftDataController { @PostMapping("/statistics") @Operation(summary = "过鱼到数统计(按用户月度汇总,支持流域/电站多选过滤)") - public ResponseResult statistics(@RequestBody DataSourceRequest dataSourceRequest) { - Page result = fishStatisticsService.queryPage(dataSourceRequest); + public ResponseResult statistics(@RequestBody DataSourceRequest dataSourceRequest, + @RequestHeader(value = "Tenant_id", required = false) String tenantId) { + Page result = fishStatisticsService.queryPage(dataSourceRequest, tenantId); return ResponseResult.successData(result); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishStatisticsMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishStatisticsMapper.java index 8bb8fdd8..75974838 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishStatisticsMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/FishStatisticsMapper.java @@ -10,10 +10,12 @@ public interface FishStatisticsMapper { List queryStatistics(@Param("basinCode") String basinCode, @Param("stationCode") String stationCode, @Param("reportMonth") String reportMonth, + @Param("tenantId") String tenantId, @Param("startRow") int startRow, @Param("endRow") int endRow); int countStatistics(@Param("basinCode") String basinCode, @Param("stationCode") String stationCode, - @Param("reportMonth") String reportMonth); + @Param("reportMonth") String reportMonth, + @Param("tenantId") String tenantId); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishStatisticsService.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishStatisticsService.java index 4a08e371..51091c04 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishStatisticsService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/IFishStatisticsService.java @@ -6,5 +6,5 @@ import com.yfd.platform.qgc_data.domain.vo.FishStatisticsVO; public interface IFishStatisticsService { - Page queryPage(DataSourceRequest dataSourceRequest); + Page queryPage(DataSourceRequest dataSourceRequest, String tenantId); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishStatisticsServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishStatisticsServiceImpl.java index e9a688da..985bdfbe 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishStatisticsServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishStatisticsServiceImpl.java @@ -26,7 +26,7 @@ public class FishStatisticsServiceImpl implements IFishStatisticsService { private FishStatisticsMapper fishStatisticsMapper; @Override - public Page queryPage(DataSourceRequest dataSourceRequest) { + public Page queryPage(DataSourceRequest dataSourceRequest, String tenantId) { DataSourceLoadOptionsBase loadOptions = dataSourceRequest.toDevRequest(); String basinNamesStr = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "basinCode"); @@ -53,9 +53,9 @@ public class FishStatisticsServiceImpl implements IFishStatisticsService { int endRow = startRow + pageSize; List records = fishStatisticsMapper.queryStatistics( - basinNamesStr, stationNamesStr, reportMonth, startRow, endRow); + basinNamesStr, stationNamesStr, reportMonth, tenantId, startRow, endRow); - int total = fishStatisticsMapper.countStatistics(basinNamesStr, stationNamesStr, reportMonth); + int total = fishStatisticsMapper.countStatistics(basinNamesStr, stationNamesStr, reportMonth, tenantId); Page page = new Page<>(); page.setRecords(records); diff --git a/backend/src/main/resources/mapper/data/FishStatisticsMapper.xml b/backend/src/main/resources/mapper/data/FishStatisticsMapper.xml index 6099458b..486542da 100644 --- a/backend/src/main/resources/mapper/data/FishStatisticsMapper.xml +++ b/backend/src/main/resources/mapper/data/FishStatisticsMapper.xml @@ -115,6 +115,9 @@ AND STATION_CODE = #{stationCode} + + AND USER_ID IN (SELECT USER_ID FROM SYS_USER_TENANT WHERE TENANT_ID = #{tenantId}) + ),