From f51c50b42d242268b98caa45ef253cc4a4638d4d Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 19 五月 2023 10:11:17 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/FaultUploadService.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/service/FaultUploadService.java b/src/main/java/com/whyc/service/FaultUploadService.java
index 817fe14..b94951f 100644
--- a/src/main/java/com/whyc/service/FaultUploadService.java
+++ b/src/main/java/com/whyc/service/FaultUploadService.java
@@ -184,13 +184,11 @@
public Response groupNameCount(int timeType, int userId) {
FaultUpload upload = new FaultUpload();
- Date now = new Date();
String uploadStartTime = null;
String uploadEndTime = null;
if(timeType == 1){
//鏈湀
Calendar monthStart = Calendar.getInstance();
- monthStart.setTime(now);
//璁剧疆涓�1鍙�,褰撳墠鏃ユ湡鏃负鏈湀绗竴澶�
monthStart.set(Calendar.DAY_OF_MONTH,1);
monthStart.set(Calendar.HOUR_OF_DAY, 0);
@@ -198,7 +196,6 @@
monthStart.set(Calendar.SECOND, 0);
Calendar monthEnd = Calendar.getInstance();
- monthEnd.setTime(now);
//璁剧疆涓�1鍙�,褰撳墠鏃ユ湡鏃负鏈湀绗竴澶�
monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
monthEnd.set(Calendar.HOUR_OF_DAY, 23);
@@ -210,19 +207,12 @@
}else if(timeType == 2){
//鏈搴�
Calendar monthStart = Calendar.getInstance();
- monthStart.setTime(now);
monthStart.set(Calendar.DAY_OF_MONTH,1);
monthStart.set(Calendar.HOUR_OF_DAY, 0);
monthStart.set(Calendar.MINUTE, 0);
monthStart.set(Calendar.SECOND, 0);
Calendar monthEnd = Calendar.getInstance();
- monthEnd.setTime(now);
- //璁剧疆涓�1鍙�,褰撳墠鏃ユ湡鏃负鏈湀绗竴澶�
- monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
- monthEnd.set(Calendar.HOUR_OF_DAY, 23);
- monthEnd.set(Calendar.MINUTE, 59);
- monthEnd.set(Calendar.SECOND, 59);
//瀹氫綅鏄鍑犲搴�
int i = monthStart.get(Calendar.MONTH);
@@ -241,12 +231,17 @@
monthStart.set(Calendar.MONTH,9);
monthEnd.set(Calendar.MONTH,11);
}
+ //璁剧疆涓�1鍙�,褰撳墠鏃ユ湡鏃负鏈湀绗竴澶�
+ monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
+ monthEnd.set(Calendar.HOUR_OF_DAY, 23);
+ monthEnd.set(Calendar.MINUTE, 59);
+ monthEnd.set(Calendar.SECOND, 59);
+
uploadStartTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthStart.getTime());
uploadEndTime = DateUtil.YYYY_MM_DD_HH_MM_SS.format(monthEnd.getTime());
}else{
//骞村害
Calendar monthStart = Calendar.getInstance();
- monthStart.setTime(now);
monthStart.set(Calendar.MONTH,0);
monthStart.set(Calendar.DAY_OF_MONTH,1);
monthStart.set(Calendar.HOUR_OF_DAY, 0);
@@ -254,7 +249,6 @@
monthStart.set(Calendar.SECOND, 0);
Calendar monthEnd = Calendar.getInstance();
- monthEnd.setTime(now);
//璁剧疆涓�1鍙�,褰撳墠鏃ユ湡鏃负鏈湀绗竴澶�
monthEnd.set(Calendar.MONTH,11);
monthEnd.set(Calendar.DAY_OF_MONTH,monthEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
--
Gitblit v1.9.1