From 84c730a2614788e140ff15d9f2f5e1eec61fcf6f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 13 Jan 2022 15:10:31 +0800
Subject: [PATCH] screen-api 修改同期对比接口接收参数
---
screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java
index 950633c..a3d2ce6 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/form/aqi/AirQualityComparisonForm.java
@@ -35,16 +35,12 @@
/*
* ���������������������������������������������������
* */
- @DateTimeFormat(pattern = "yyyy")
- @JsonFormat(pattern = "yyyy", timezone = "GMT+8")
- Date year;
+ String dateType;
/*
* ���������������������������������������������������
* */
- @DateTimeFormat(pattern = "yyyy-MM")
- @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
- Date month;
+ String time;
/*
* ���������������������������������
@@ -77,23 +73,27 @@
return false;
}
//������������
- if (year != null) {
- if(month!=null)
- return false;
- startDate = DateUtils.getFirstDayOfYear(year);
- endDate = DateUtils.getLastDayOfYear(year);
+ if(dateType.equals(Constants.MONTH)){
+ Date date = DateUtils.getDate(time, "yyyy-MM");
+ startDate = DateUtils.getFirstDayOfMonth(date);
+ endDate = DateUtils.getLastDayOfMonth(date);
return true;
}
- if (month != null) {
- if(year!=null)
- return false;
- startDate = DateUtils.getFirstDayOfMonth(month);
- endDate = DateUtils.getLastDayOfMonth(month);
+
+ if(dateType.equals(Constants.YEAR)){
+ Date date = DateUtils.getDate(time, "yyyy");
+ startDate = DateUtils.getFirstDayOfYear(date);
+ endDate = DateUtils.getLastDayOfYear(date);
return true;
}
+
if(startDate!=null&&endDate!=null)
return true;
return false;
}
+
+ public static void main(String[] args) {
+
+ }
}
--
Gitblit v1.8.0