diff --git a/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java b/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java index 3ff4e233..fbfcbd81 100644 --- a/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java +++ b/src/main/java/com/lz/modules/performance/controller/IndicatorLibraryController.java @@ -109,10 +109,10 @@ public class IndicatorLibraryController { return R.ok(); } - @PostMapping("/statistical") + @GetMapping("/statistical") @ApiOperation("统计指标") - public R statistical() { - List dtos = indicatorLibraryService.statisticalByIndicatorType(); + public R statistical(@RequestParam("indicatorType") @ApiParam(value = "指标分类id",name = "indicatorType") Long indicatorType) { + List dtos = indicatorLibraryService.statisticalByIndicatorType(indicatorType); return R.ok().put("data",dtos); } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java b/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java index 13e30455..c446191c 100644 --- a/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/IndicatorLibraryMapper.java @@ -42,7 +42,7 @@ public interface IndicatorLibraryMapper extends BaseMapper { void updateIndicatorLibrarysMove(@Param("ids")List ids,@Param("indicatorType")Long indicatorType); - List statisticalByIndicatorType(); + List statisticalByIndicatorType(Long indicatorType); int deleteIndicatorLibrarysByIndicatorType(@Param("indicatorType") Integer indicatorType); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java b/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java index 97acce4b..2898bc29 100644 --- a/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java +++ b/src/main/java/com/lz/modules/performance/service/IndicatorLibraryService.java @@ -41,7 +41,7 @@ public interface IndicatorLibraryService extends IService { void updateIndicatorLibrarysMove(IndicatorLibraryMoveDto dto); - List statisticalByIndicatorType(); + List statisticalByIndicatorType(Long indicatorType); int deleteIndicatorLibrarysIndicatorType(Integer indicatorType); diff --git a/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java index 59f53118..83ab7e14 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/IndicatorLibraryServiceImpl.java @@ -103,8 +103,8 @@ public class IndicatorLibraryServiceImpl extends ServiceImpl statisticalByIndicatorType() { - List dtos = indicatorLibraryMapper.statisticalByIndicatorType(); + public List statisticalByIndicatorType(Long indicatorType) { + List dtos = indicatorLibraryMapper.statisticalByIndicatorType(indicatorType); StatisticalIndicatorTypeDto dto = new StatisticalIndicatorTypeDto(); dto.setName("全部分类"); dto.setIndicatorType(null); diff --git a/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml b/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml index 0d68742b..f539794c 100644 --- a/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml +++ b/src/main/resources/mapper/performance/IndicatorLibraryMapper.xml @@ -125,9 +125,12 @@