diff --git a/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Controller/StatisticsController.java b/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Controller/StatisticsController.java index 4e11021..da289ec 100644 --- a/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Controller/StatisticsController.java +++ b/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Controller/StatisticsController.java @@ -68,9 +68,9 @@ public class StatisticsController { * 入参:内业小班号NYXBH+乡XIANG */ @GetMapping("/district/count") - public ApiResponse> getDistrictCount() { + public ApiResponse> getDistrictCount(@RequestParam String district) { try { - List data = statisticsService.getDistrictCount(); + List data = statisticsService.getDistrictCount(district); return ApiResponse.success(data); } catch (Exception e) { return ApiResponse.error("查询小班计数失败:" + e.getMessage()); diff --git a/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Dto/DistrictCountDTO.java b/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Dto/DistrictCountDTO.java index 2a024d0..f06eda1 100644 --- a/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Dto/DistrictCountDTO.java +++ b/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Dto/DistrictCountDTO.java @@ -8,7 +8,6 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class DistrictCountDTO { - private String name; private String ny; private String wy; private String yd; diff --git a/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Mapper/TaskCommonMapper.java b/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Mapper/TaskCommonMapper.java index c8d9824..ab5ab98 100644 --- a/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Mapper/TaskCommonMapper.java +++ b/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Mapper/TaskCommonMapper.java @@ -33,7 +33,7 @@ public interface TaskCommonMapper { * 按照区统计信息(内业外业样地数量) * @return 统计结果 DTO */ - List loadDistrictCount(); + List loadDistrictCount(String district); diff --git a/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Service/StatisticsService.java b/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Service/StatisticsService.java index 8434fae..59b1745 100644 --- a/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Service/StatisticsService.java +++ b/src/main/java/com/whu/edu/LyStatistic/MapLyStatistic/Service/StatisticsService.java @@ -56,9 +56,9 @@ public class StatisticsService { /** * 查询所有区的计数信息 */ - public List getDistrictCount() { + public List getDistrictCount(String district) { // 直接从数据库一次性查出“按区聚合后的统计数据” - List list = taskCommonMapper.loadDistrictCount(); + List list = taskCommonMapper.loadDistrictCount(district); return list; } diff --git a/src/main/resources/mapper/MapLyStatistic/TaskCommonMapper.xml b/src/main/resources/mapper/MapLyStatistic/TaskCommonMapper.xml index 2ed0303..6a3264e 100644 --- a/src/main/resources/mapper/MapLyStatistic/TaskCommonMapper.xml +++ b/src/main/resources/mapper/MapLyStatistic/TaskCommonMapper.xml @@ -108,10 +108,10 @@