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 |    6 +++---
 1 files changed, 3 insertions(+), 3 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 fdc9937..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,7 +81,7 @@
             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();
@@ -168,7 +168,7 @@
             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();

--
Gitblit v1.7.1