From 9507c03f27cd8fa99381142236cc2eafbe01868d Mon Sep 17 00:00:00 2001 From: ustcyc <yincun@163.com> Date: 星期四, 10 四月 2025 18:36:54 +0800 Subject: [PATCH] Merge pull request #50 from zhitan-cloud/zhangjw --- zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java b/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java index b9dc2f9..99aada3 100644 --- a/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java +++ b/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java @@ -44,14 +44,26 @@ /** * 鑺傜偣id */ - @NotBlank(message = "鑺傜偣id涓嶈兘涓虹┖") @ApiModelProperty(value = "鑺傜偣id") private String nodeId; + + @NotBlank(message = "妯″瀷缂栫爜涓嶈兘涓虹┖") + @ApiModelProperty(value = "妯″瀷缂栫爜") + private String modelCode; public TimeType getTimeType() { if (ObjectUtils.isEmpty(timeType)) { return TimeType.DAY; } - return timeType; + switch (timeType) { + case DAY: + return TimeType.HOUR; + case MONTH: + return TimeType.DAY; + case YEAR: + return TimeType.MONTH; + default: + return timeType; + } } } -- Gitblit v1.9.3