From 4279c20fba50d8c7fb056c515e390861eacf24fb Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Fri, 19 Jul 2024 18:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9D=9E=E6=9C=BA=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90=20=E6=8C=89?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DCPerceivedEventsWarningController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java index b888e8a6..46766083 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java @@ -282,7 +282,13 @@ public class DCPerceivedEventsWarningController extends BaseController { List> data = perceivedEventsWarningService.selectNonAutomaticWarningTimeType(dcWarning); for (Map datum : data) { NonAutomaticWarningTimeType nonAutomaticWarningTimeType = new NonAutomaticWarningTimeType(); - nonAutomaticWarningTimeType.setTime(datum.get("time").toString()); + if (Objects.equals(dcWarning.getType(), UniversalEnum.LOWERCASE_YEAR.getValue())) { + nonAutomaticWarningTimeType.setTime(datum.get("month").toString()); + } else if (Objects.equals(dcWarning.getType(), UniversalEnum.LOWERCASE_MONTH.getValue())) { + nonAutomaticWarningTimeType.setTime(datum.get("day").toString()); + } else { + nonAutomaticWarningTimeType.setTime(datum.get("time").toString()); + } nonAutomaticWarningTimeType.setNumber(datum.get("number").toString()); list.add(nonAutomaticWarningTimeType); }