优化非机预警统计分析 按日期导出

zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java

@@ -282,7 +282,13 @@ public class DCPerceivedEventsWarningController extends BaseController {
             List<HashMap<String,Object>> data = perceivedEventsWarningService.selectNonAutomaticWarningTimeType(dcWarning);
             for (Map<String, Object> 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);
             }