From 2c6c6c096c870ef741e1be11de547d8ed7b5fbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Wed, 12 Mar 2025 02:55:39 +0800 Subject: [PATCH] =?UTF-8?q?fixbug:=E5=A0=A4=E9=98=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/dto/CountDateDto.java | 3 +-- .../kms/yxgh/common/enums/DfYhV2StatusEnum.java | 1 + .../kms/yxgh/common/enums/StaticIndexEnum.java | 17 +++++------------ .../df/mapper/DfCheckingProblemV2Mapper.java | 8 ++++---- .../df/mapper/DfCheckingRecordV2Mapper.java | 2 +- .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java | 2 +- 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java index 3d2c46d2..340ef77e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java @@ -4,7 +4,6 @@ import lombok.Data; @Data public class CountDateDto { - private String level; - private String myData; + private String myDate; private String mySum; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java index ee116c34..2f0a7e8a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java @@ -13,6 +13,7 @@ public enum DfYhV2StatusEnum { YES_UNDER("已养护", "6"); + private final String name; private final String value; 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 03782098..b16918e9 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 @@ -45,22 +45,22 @@ public enum StaticIndexEnum { DF_QX_DJ_LX_SUM("零星", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_LX); - return levelGroup(list); + return dataGroup(list); }, "个", "0"), DF_QX_DJ_YB_SUM("一般", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_YB); - return levelGroup(list); + return dataGroup(list); }, "个", "0"), DF_QX_DJ_JD_SUM("较大", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_JD); - return levelGroup(list); + return dataGroup(list); }, "个", "0"), DF_QX_DJ_ZD_SUM("重大", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_ZD); - return levelGroup(list); + return dataGroup(list); }, "个", "0"), @@ -127,20 +127,13 @@ public enum StaticIndexEnum { } - private static Map levelGroup(List list) { - if (CollectionUtil.isEmpty(list) && list.isEmpty()) { - return Collections.emptyMap(); - } - return list.stream() - .collect(Collectors.toMap(CountDateDto::getLevel, CountDateDto::getMySum)); - } public static Map dataGroup(List list) { if (CollectionUtil.isEmpty(list) && list.isEmpty()) { return Collections.emptyMap(); } return list.stream() - .collect(Collectors.toMap(CountDateDto::getMyData, CountDateDto::getMySum)); + .collect(Collectors.toMap(CountDateDto::getMyDate, CountDateDto::getMySum)); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java index 50dcac21..626bbf32 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java @@ -35,7 +35,7 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper " + - "select DATE_FORMAT(create_time, '%Y-%m-%d') as myData,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + + "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + " and create_time >= #{data.startTime} " + " and create_time <= #{data.endTime} " + "" + @@ -50,7 +50,7 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper " + - "select problem_level as level,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + + "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + " and create_time >= #{data.startTime} " + " and create_time <= #{data.endTime} " + "" + @@ -59,13 +59,13 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper" + "and category = #{category.value} " + "" + - "group by problem_level " + + "group by DATE_FORMAT(create_time, '%Y-%m-%d') " + "") List countLevel(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); @Select("