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); }