From 2400238fd8ae34a2f10a4ea35db9b1739c534a7e Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期日, 08 十月 2023 13:34:04 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java b/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java index 628ac8e..66a5d7c 100644 --- a/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java +++ b/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java @@ -74,6 +74,9 @@ }else if("1007".equals(type)){ //绉诲姩缁堢 return Results.succeed(statisticalService.apponekeyYear(esParam)); + }else if("1008".equals(type)){ + //绉诲姩缁堢 + return Results.succeed(statisticalService.pumpYear(esParam)); }else if("1010".equals(type)){ //鐢靛瓙鍥存爮 return Results.succeed(statisticalService.wallYear(esParam)); @@ -120,6 +123,9 @@ }else if("1007".equals(type)){ //绉诲姩缁堢 return Results.succeed(statisticalService.apponekeyMonth(esParam)); + }else if("1008".equals(type)){ + //闆疯揪鍋滄満 + return Results.succeed(statisticalService.pumpMonth(esParam)); }else if("1010".equals(type)){ //鐢靛瓙鍥存爮 return Results.succeed(statisticalService.wallMonth(esParam)); -- Gitblit v1.9.3