From 25a638e0d5f282d26ff9da47e5b7aa5c9c1603d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 18:34:20 +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 | 10 +++++-----
1 files changed, 5 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 8871383..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
@@ -53,7 +53,7 @@
@Override
public void insertOrUpdate(Integer id, String staTime, String startTime,
- String num1, Double num2, Double num3, Integer num4,
+ 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是否为空，为空执行添加，或者执行修改
@@ -81,10 +81,10 @@
driverActivityOnline.setEndTime(endTimes);
driverActivityOnline.setInsertTime(nowDay);
driverActivityOnline.setType(1);
- driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setOnline(Double.valueOf(num4));
driverActivityOnline.setMoney(num5);
- driverActivityOnline.insertOrUpdate();
driverActivityOnline.setOfflineTime(Double.valueOf(num12));
+ driverActivityOnline.insertOrUpdate();
// //添加在线活动-出租车
// driverActivityOnline = new DriverActivityOnline();
// driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
@@ -168,10 +168,10 @@
driverActivityOnline.setStartTime(startTimes);
driverActivityOnline.setEndTime(endTimes);
driverActivityOnline.setType(1);
- driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setOnline(Double.valueOf(num4));
driverActivityOnline.setMoney(num5);
- driverActivityOnline.insertOrUpdate();
driverActivityOnline.setOfflineTime(Double.valueOf(num12));
+ driverActivityOnline.insertOrUpdate();
//添加在线活动-出租车
// driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
// if(driverActivityOnline==null){
--
Gitblit v1.7.1