From e18c4a8ac170fea6e079047a27f72032c80eee67 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 九月 2024 14:12:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
index c38df7c..83b463b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -114,9 +114,9 @@
if(timeStart_open != null && timeStart_open != "") {
timeStart_open = timeStart_open + " 00:00:00";
} else {
- timeStart_open = LocalDate.now() + " 00:00:00";
+ timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00";
}
- qo.setTimeStop_open(timeStart_open);
+ qo.setTimeStart_open(timeStart_open);
if(timeStop_open != null && timeStop_open != "") {
timeStop_open = timeStop_open + " 23:59:59";
@@ -130,7 +130,7 @@
if(timeStart_close != null && timeStart_close != "") {
timeStart_close = timeStart_close + " 00:00:00";
} else {
- timeStart_close = LocalDate.now() + " 00:00:00";
+ timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00";
}
qo.setTimeStart_close(timeStart_close);
@@ -163,7 +163,7 @@
String timeStop_open = qo.getTimeStop_open();
if(timeStart_open != null) {
timeStart_open = timeStart_open + " 00:00:00";
- qo.setTimeStop_open(timeStart_open);
+ qo.setTimeStart_open(timeStart_open);
}
if(timeStop_open != null) {
timeStop_open = timeStop_open + " 23:59:59";
--
Gitblit v1.8.0