From bb8b200d53171dcc0727c845c435f655b3d2f55a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 08 八月 2022 17:58:36 +0800
Subject: [PATCH] 年月fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java | 6 +++---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java | 8 ++++----
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java
index 6e47bd7..fb991a7 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java
@@ -7,9 +7,9 @@
// type=1:月 type=2:年
private Integer type;
- private Integer year;
+ private int year;
- private Integer month;
+ private int month;
public String getLevel() {
return level;
@@ -27,19 +27,19 @@
this.type = type;
}
- public Integer getYear() {
+ public int getYear() {
return year;
}
- public void setYear(Integer year) {
+ public void setYear(int year) {
this.year = year;
}
- public Integer getMonth() {
+ public int getMonth() {
return month;
}
- public void setMonth(Integer month) {
+ public void setMonth(int month) {
this.month = month;
}
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
index 3987170..ca02f4c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
@@ -252,15 +252,15 @@
if (query.getType()==1){
// 月
- Integer year = query.getYear();
- Integer month = query.getMonth();
+ int year = query.getYear();
+ int month = query.getMonth();
dbQuery.setStartTime(TimeUtils.getMonthFirst(year,month));
dbQuery.setEndTime(TimeUtils.getMonthLast(year,month));
list = emergencyDrillExecuteInfoService.selectByMouthTimeAndType(dbQuery);
}
if (query.getType()==2){
// 年
- Integer year = query.getYear();
+ int year = query.getYear();
dbQuery.setStartTime(TimeUtils.getYearFirst(year));
dbQuery.setEndTime(TimeUtils.getYearLast(year));
list = emergencyDrillExecuteInfoService.selectByYearTimeAndType(dbQuery);
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java
index d2a2c82..13cd0dd 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java
@@ -17,7 +17,7 @@
* @param year 年份
* @return Date
*/
- public static String getYearFirst(Integer year){
+ public static String getYearFirst(int year){
Calendar calendar = Calendar.getInstance();
calendar.clear();
calendar.set(Calendar.YEAR, year);
@@ -30,7 +30,7 @@
* @param year 年份
* @return Date
*/
- public static String getYearLast(Integer year){
+ public static String getYearLast(int year){
Calendar calendar = Calendar.getInstance();
calendar.clear();
calendar.set(Calendar.YEAR, year);
@@ -45,7 +45,7 @@
* @param month 年份
* @return Date
*/
- public static String getMonthFirst(Integer year ,Integer month){
+ public static String getMonthFirst(int year ,int month){
Calendar calendar = Calendar.getInstance();
calendar.clear();
calendar.set(Calendar.YEAR, year);
@@ -59,7 +59,7 @@
* @param month 年份
* @return Date
*/
- public static String getMonthLast(Integer year ,Integer month){
+ public static String getMonthLast(int year ,int month){
Calendar calendar = Calendar.getInstance();
calendar.clear();
calendar.set(Calendar.YEAR, year);
--
Gitblit v1.9.2