From 8a8c4be2a0ca471a10494d737506ef8e47d3dcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Sun, 16 Mar 2025 15:49:13 +0800 Subject: [PATCH] =?UTF-8?q?edit:=E4=B8=80=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/common/enums/ProjectCharEnum.java | 2 +- .../yxgh/common/enums/StaticIndexEnum.java | 46 ++++++++++++++----- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java index a66affff..5f916c83 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java @@ -93,7 +93,7 @@ public enum ProjectCharEnum { ,StaticIndexEnum.YZT_DAILY_JJ_NUMBER_SUM ), "数量", Collections.emptyList()), - K6_1("日常巡查", Collections.singletonList( + K6_1("巡查养护", Collections.singletonList( StaticIndexEnum.YZT_DAILY_BL_NUMBER_SUM ), "数量", Collections.emptyList()), diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index 689a041c..2e230a2e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -376,7 +376,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_FXHZ_SUM.getValue())); + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_FXHZ_SUM.getValue()) + .groupBy(BsSgcSzSafeJbxx::getWagaType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "1"), @@ -385,7 +387,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_JZZ_SUM.getValue())); + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_JZZ_SUM.getValue()) + .groupBy(BsSgcSzSafeJbxx::getWagaType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "2"), @@ -394,7 +398,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_PTSZ_SUM.getValue())); + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_PTSZ_SUM.getValue()) + .groupBy(BsSgcSzSafeJbxx::getWagaType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "3"), @@ -403,7 +409,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_YJSZ_SUM.getValue())); + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_YJSZ_SUM.getValue()) + .groupBy(BsSgcSzSafeJbxx::getWagaType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "4"), @@ -412,7 +420,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_DCZ_SUM.getValue())); + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_DCZ_SUM.getValue()) + .groupBy(BsSgcSzSafeJbxx::getWagaType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "5"), @@ -421,7 +431,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_CZ_SUM.getValue())); + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_CZ_SUM.getValue()) + .groupBy(BsSgcSzSafeJbxx::getWagaType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "6"), @@ -430,7 +442,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_DLXHHZ.getValue())); + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_DLXHHZ.getValue()) + .groupBy(BsSgcSzSafeJbxx::getWagaType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "7"), @@ -439,7 +453,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_QT_SUM.getValue())); + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_QT_SUM.getValue()) + .groupBy(BsSgcSzSafeJbxx::getWagaType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "9"), @@ -449,7 +465,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_DF_HJD_SUM.getValue())); + .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_DF_HJD_SUM.getValue()) + .groupBy(BsSgcDfSafeJbxx::getDikeType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "1"), @@ -458,7 +476,9 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_HD_SUM.getValue())); + .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_HD_SUM.getValue()) + .groupBy(BsSgcDfSafeJbxx::getDikeType) + ); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "2"), @@ -467,7 +487,8 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_HAID_SUM.getValue())); + .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_HAID_SUM.getValue()) + .groupBy(BsSgcDfSafeJbxx::getDikeType)); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "3"), @@ -476,7 +497,8 @@ public enum StaticIndexEnum { Map map = new HashMap<>(); BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class); int count = service.count(new LambdaQueryWrapper() - .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_WYD_SUM.getValue())); + .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_WYD_SUM.getValue()) + .groupBy(BsSgcDfSafeJbxx::getDikeType)); map.put("sum", String.valueOf(count)); return map; }, "个", "0", "4"),