From 13be3b8bd13cfa77fa6552e9731949df5e657108 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 09:14:59 +0800
Subject: [PATCH] 调整配置文件, 修改绑定查询
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
index 349ce8a..b38cc3d 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
@@ -88,11 +88,12 @@
endTime = deviceRecord.getUseEndDate().format(formatter);
String[] startTimeSplit = startTime.split(" ");
String[] endTimeSplit = endTime.split(" ");
- startTime = startTimeSplit[1];
if (startTimeSplit[0].equals(endTimeSplit[0])) {
+ startTime = startTimeSplit[1];
endTime = endTimeSplit[1];
} else {
endTime = endTimeSplit[0] + '\n' + endTimeSplit[1];
+ startTime = startTimeSplit[0] + '\n' + startTimeSplit[1];
}
DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy.M.d");
operationDate = deviceRecord.getUseStartDate().format(formatter2);
--
Gitblit v1.9.3