From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 五月 2024 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java
index 577daa2..6326be1 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/LineSiteServiceImpl.java
@@ -137,11 +137,17 @@
map.put("price", jsonObject.getString("num1"));
data = map;
list.add(data);
+ if (lineShift.getStartTime().equals(lineShift.getEndTime())){
+ data.put("startTime",lineShift.getStartTime());
+ }
}
}
if(b){
data.put("id", lineShift.getId());
- data.put("startTime", lineShift.getStartTime());
+ data.put("startTime", lineShift.getStartTime()+"-"+lineShift.getEndTime());
+ if (lineShift.getStartTime().equals(lineShift.getEndTime())){
+ data.put("startTime",lineShift.getStartTime());
+ }
list.add(data);
}
}
--
Gitblit v1.7.1