From 01d8de48c76467ff3b99b204e66d3ef86506fa52 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 18:23:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
index 370509d..e61dc8c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -52,7 +52,10 @@
}
@Override
- public void insertOrUpdate(Integer id, String staTime, String startTime, String num1, Double num2, Double num3, Integer num4, Double num5, Integer num6, Double num7, Integer num8, Double num9, Integer num10, Double num11,String num12) {
+ public void insertOrUpdate(Integer id, String staTime, String startTime,
+ String num1, Double num2, Double num3, String num4,
+ Double num5, Integer num6, Double num7, Integer num8,
+ Double num9, Integer num10, Double num11,String num12) {
//判断id是否为空，为空执行添加，或者执行修改
if(id==null){
String[] timeArray = startTime.split(" - ");
@@ -69,7 +72,6 @@
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
driverActivity.setEndTime(endTimes);
- driverActivity.setOffline(num12);
driverActivity.insertOrUpdate();
//添加在线活动-专车
DriverActivityOnline driverActivityOnline = new DriverActivityOnline();
@@ -79,8 +81,9 @@
driverActivityOnline.setEndTime(endTimes);
driverActivityOnline.setInsertTime(nowDay);
driverActivityOnline.setType(1);
- driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setOnline(Double.valueOf(num4));
driverActivityOnline.setMoney(num5);
+ driverActivityOnline.setOfflineTime(Double.valueOf(num12));
driverActivityOnline.insertOrUpdate();
// //添加在线活动-出租车
// driverActivityOnline = new DriverActivityOnline();
@@ -152,7 +155,7 @@
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
driverActivity.setEndTime(endTimes);
- driverActivity.setOffline(num12);
+
driverActivity.insertOrUpdate();
//添加在线活动-专车
DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",1));
@@ -165,8 +168,9 @@
driverActivityOnline.setStartTime(startTimes);
driverActivityOnline.setEndTime(endTimes);
driverActivityOnline.setType(1);
- driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setOnline(Double.valueOf(num4));
driverActivityOnline.setMoney(num5);
+ driverActivityOnline.setOfflineTime(Double.valueOf(num12));
driverActivityOnline.insertOrUpdate();
//添加在线活动-出租车
// driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
--
Gitblit v1.7.1