From f3baf33f3dbb9b3091881185ccbe72327e7326c1 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 09:39:48 +0800
Subject: [PATCH] 查询巡检轨迹接口返回值增加巡检距离字段
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 8 +++++---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
index 38e1d90..c11b0d3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeInspectMapper.xml
@@ -130,7 +130,8 @@
ba_user.`name` AS inspectorName,
oi.id AS inspectId,
oi.start_time AS startTime,
- oi.stop_time AS stopTime
+ oi.stop_time AS stopTime,
+ oi.inspect_distance AS inspectDistance
FROM `ope_inspect` oi
INNER JOIN `ba_user` ON oi.inspector_id = ba_user.id
<where>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
index 063264f..bbe60a5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java
@@ -73,11 +73,13 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
String timeStart = queryVo.getTimeStart();
String timeStop = queryVo.getTimeStop();
- if (timeStart != null && timeStart != "") {
+
+ if (timeStart == null || timeStart == "" || timeStop == null || timeStop == "") {
+ queryVo.setTimeStart(null);
+ queryVo.setTimeStop(null);
+ } else {
timeStart = timeStart + " 00:00:00";
queryVo.setTimeStart(timeStart);
- }
- if (timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
queryVo.setTimeStop(timeStop);
}
--
Gitblit v1.8.0