From e3026dae68fc425df7ca46c1b416aae32e036098 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 三月 2025 23:50:05 +0800
Subject: [PATCH] 修改cnas部分导出
---
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