From b21d86c26b5fda7414df86d1221e4109cc501367 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:05:58 +0800 Subject: [PATCH] =?UTF-8?q?fixbug:=E4=B8=80=E5=BC=A0=E5=9B=BE-=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/PatrolMaintenanceCategory.java | 2 +- .../yxgh/common/enums/StaticIndexEnum.java | 78 +++++++++++++------ 2 files changed, 55 insertions(+), 25 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java index eb3e59ec..1835f7c4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java @@ -16,7 +16,7 @@ public enum PatrolMaintenanceCategory { YZT_SZ_YJSZ_SUM("引进水闸", "4"), YZT_SZ_DCZ_SUM("挡潮闸", "5"), YZT_SZ_CZ_SUM("船闸", "6"), - YZT_("多类型混合闸", "7"), + YZT_SZ_DLXHHZ("多类型混合闸", "7"), YZT_SZ_QT_SUM("其他", "9"), YZT_DF_HJD_SUM("河江堤", "1"), 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 640d1411..689a041c 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 @@ -8,8 +8,10 @@ import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysXzqhService; import com.kms.yg.cz.service.AttStBaseService; import com.kms.yg.cz.service.AttStMpService; +import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.kms.yg.res.service.AttResBaseService; +import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSzrw; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.kms.yg.sz.service.BsSgcSzSzrwService; @@ -372,82 +374,110 @@ public enum StaticIndexEnum { YZT_SZ_FXHZ_SUM("分泄洪闸", sp -> { Map map = new HashMap<>(); - AttStMpService service = SpringUtils.getBean(AttStMpService.class); - map.put("sum", String.valueOf(service.count())); + BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_FXHZ_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "1"), YZT_SZ_JZZ_SUM("节制闸", sp -> { Map map = new HashMap<>(); - AttStMpService service = SpringUtils.getBean(AttStMpService.class); - map.put("sum", String.valueOf(service.count())); + BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_JZZ_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "2"), YZT_SZ_PTSZ_SUM("排退水闸", sp -> { Map map = new HashMap<>(); - AttStMpService service = SpringUtils.getBean(AttStMpService.class); - map.put("sum", String.valueOf(service.count())); + BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_PTSZ_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "3"), YZT_SZ_YJSZ_SUM("引进水闸", sp -> { Map map = new HashMap<>(); - AttStMpService service = SpringUtils.getBean(AttStMpService.class); - map.put("sum", String.valueOf(service.count())); + BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_YJSZ_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "4"), YZT_SZ_DCZ_SUM("挡潮闸", sp -> { Map map = new HashMap<>(); - AttStMpService service = SpringUtils.getBean(AttStMpService.class); - map.put("sum", String.valueOf(service.count())); + BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_DCZ_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "5"), YZT_SZ_CZ_SUM("船闸", sp -> { Map map = new HashMap<>(); - AttStMpService service = SpringUtils.getBean(AttStMpService.class); - map.put("sum", String.valueOf(service.count())); + BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_CZ_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "6"), YZT_SZ_DLXHHZ_SUM("多类型混合闸", sp -> { Map map = new HashMap<>(); - AttStMpService service = SpringUtils.getBean(AttStMpService.class); - map.put("sum", String.valueOf(service.count())); + BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_DLXHHZ.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "7"), YZT_SZ_QT_SUM("其他", sp -> { Map map = new HashMap<>(); - AttStMpService service = SpringUtils.getBean(AttStMpService.class); - map.put("sum", String.valueOf(service.count())); + BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcSzSafeJbxx::getWagaType, PatrolMaintenanceCategory.YZT_SZ_QT_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "9"), YZT_DF_HJD_SUM("河江堤", sp -> { - Map map =new HashMap<>(); - map.put("sum","15"); + 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())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "1"), YZT_HD_SUM("湖堤", sp -> { - Map map =new HashMap<>(); - map.put("sum","47"); + Map map = new HashMap<>(); + BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_HD_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "2"), YZT_HAID_SUM("海堤", sp -> { - Map map =new HashMap<>(); - map.put("sum","156"); + Map map = new HashMap<>(); + BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_HAID_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "3"), YZT_WYD_SUM("围圩堤", sp -> { - Map map =new HashMap<>(); - map.put("sum","975"); + Map map = new HashMap<>(); + BsSgcDfSafeJbxxService service = SpringUtils.getBean(BsSgcDfSafeJbxxService.class); + int count = service.count(new LambdaQueryWrapper() + .eq(BsSgcDfSafeJbxx::getDikeType, PatrolMaintenanceCategory.YZT_WYD_SUM.getValue())); + map.put("sum", String.valueOf(count)); return map; }, "个", "0", "4"),