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 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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);
--
Gitblit v1.9.2