From e86db806e1dcde94b1aa38230138a3fa3895572a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 19 十二月 2024 15:04:22 +0800
Subject: [PATCH] 增加巡检轨迹接口 返回值inspectid、inspectorid由Long类型改为String
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectSv.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
index 7e7f3c1..2e97c7f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/inspect/InspectCtrl.java
@@ -92,8 +92,8 @@
// 鏋勯�犺繑鍥炲��
JSONObject inspect_job = new JSONObject();
- inspect_job.put("inspectorId", inspectorId);
- inspect_job.put("inspectId", inspectId);
+ inspect_job.put("inspectorId", inspectorId.toString());
+ inspect_job.put("inspectId", inspectId.toString());
result_array.add(inspect_job);
for (int j = 0; j < tracks.size(); j++) {
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 b5e7f37..a0e21e6 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
@@ -72,11 +72,11 @@
//瀹屽杽鏌ヨ鍏呭�艰褰曠殑璧锋鏃堕棿
String timeStart = queryVo.getTimeStart();
String timeStop = queryVo.getTimeStop();
- if (timeStart != null) {
+ if (timeStart != null || timeStart != "") {
timeStart = timeStart + " 00:00:00";
queryVo.setTimeStart(timeStart);
}
- if (timeStop != null) {
+ if (timeStop != null || timeStop != "") {
timeStop = timeStop + " 23:59:59";
queryVo.setTimeStop(timeStop);
}
--
Gitblit v1.8.0