From 03bff35b0d011eb7d822ff021c8908566268b95c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 05 八月 2024 18:58:26 +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 | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 2131e44..d17f46c 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
@@ -13,6 +13,8 @@
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.stereotype.Service;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -109,25 +111,35 @@
public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) {
String timeStart_open = qo.getTimeStart_open();
String timeStop_open = qo.getTimeStop_open();
- if(timeStart_open != null) {
+ if(timeStart_open != null && timeStart_open != "") {
timeStart_open = timeStart_open + " 00:00:00";
- qo.setTimeStop_open(timeStart_open);
+ } else {
+ timeStart_open = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString();
}
- if(timeStop_open != null) {
+ qo.setTimeStop_open(timeStart_open);
+
+ if(timeStop_open != null && timeStop_open != "") {
timeStop_open = timeStop_open + " 23:59:59";
- qo.setTimeStop_open(timeStop_open);
+ }else {
+ timeStop_open = LocalDate.now() + " 23:59:59";
}
+ qo.setTimeStop_open(timeStop_open);
String timeStart_close = qo.getTimeStart_close();
String timeStop_close = qo.getTimeStop_close();
- if(timeStart_close != null) {
+ if(timeStart_close != null && timeStart_close != "") {
timeStart_close = timeStart_close + " 00:00:00";
- qo.setTimeStart_close(timeStart_close);
+ } else {
+ timeStart_close = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString();
}
- if(timeStop_close != null) {
+ qo.setTimeStart_close(timeStart_close);
+
+ if(timeStop_close != null && timeStop_close != "") {
timeStop_close = timeStop_close + " 23:59:59";
- qo.setTimeStop_close(timeStop_close);
+ }else {
+ timeStop_close = LocalDate.now() + " 23:59:59";
}
+ qo.setTimeStop_close(timeStop_close);
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params);
--
Gitblit v1.8.0