From bf8ca6bf39cb2df0ba69c5a99c3c5c82109ee363 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 08 八月 2022 17:56:38 +0800
Subject: [PATCH] 年月

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java |    7 ++++---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java                               |   14 +++++++-------
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java           |   19 +++++++++++++++++++
 3 files changed, 30 insertions(+), 10 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 cbc549d..6e47bd7 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,6 +7,9 @@
     // type=1:月  type=2:年
     private Integer type;
 
+    private Integer year;
+
+    private Integer month;
 
     public String getLevel() {
         return level;
@@ -23,4 +26,20 @@
     public void setType(Integer type) {
         this.type = type;
     }
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public Integer getMonth() {
+        return month;
+    }
+
+    public void setMonth(Integer 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 e8b214c..3987170 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
@@ -249,17 +249,18 @@
         EmergencyDrillExecuteRPCDBQuery dbQuery = new EmergencyDrillExecuteRPCDBQuery();
         dbQuery.setLevel(query.getLevel());
         // 根据时间、级别获取统计
-        Calendar calendar = Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
+
         if (query.getType()==1){
             // 月
-            int month = calendar.get(Calendar.MONTH);
+            Integer year = query.getYear();
+            Integer 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();
             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 426f239..d2a2c82 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(int year){
+    public static String getYearFirst(Integer year){
         Calendar calendar = Calendar.getInstance();
         calendar.clear();
         calendar.set(Calendar.YEAR, year);
@@ -30,7 +30,7 @@
      * @param year 年份
      * @return Date
      */
-    public static String getYearLast(int year){
+    public static String getYearLast(Integer year){
         Calendar calendar = Calendar.getInstance();
         calendar.clear();
         calendar.set(Calendar.YEAR, year);
@@ -45,11 +45,11 @@
      * @param month 年份
      * @return Date
      */
-    public static String getMonthFirst(int year ,int month){
+    public static String getMonthFirst(Integer year ,Integer month){
         Calendar calendar = Calendar.getInstance();
         calendar.clear();
         calendar.set(Calendar.YEAR, year);
-        calendar.set(Calendar.MONTH, month);
+        calendar.set(Calendar.MONTH, month-1);
         Date currYearFirst = calendar.getTime();
         return formatDate(currYearFirst);
     }
@@ -59,11 +59,11 @@
      * @param month 年份
      * @return Date
      */
-    public static String getMonthLast(int year ,int month){
+    public static String getMonthLast(Integer year ,Integer month){
         Calendar calendar = Calendar.getInstance();
         calendar.clear();
         calendar.set(Calendar.YEAR, year);
-        calendar.set(Calendar.MONTH, month);
+        calendar.set(Calendar.MONTH, month-1);
         calendar.roll(Calendar.DAY_OF_MONTH, -1);
         Date currYearLast = calendar.getTime();
 
@@ -75,6 +75,6 @@
         Calendar date = Calendar.getInstance();
         int year = date.get(Calendar.YEAR);
         int month = date.get(Calendar.MONTH);
-        System.out.println(getMonthLast(year,month));
+        System.out.println(getMonthLast(year,2));
     }
 }

--
Gitblit v1.9.2