From 5ed736959185a95c6140378c2db12915cf577dbd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 19:54:39 +0800
Subject: [PATCH] igo所有代码提交
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
index 052cbc0..8ff141a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -77,7 +77,7 @@
public String receiveRecord(Model model,Integer activityId){
model.addAttribute("activityId",activityId);
DriverActivity driverActivity = driverActivityService.selectById(activityId);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
model.addAttribute("startTime", sdf.format(driverActivity.getStartTime()));
model.addAttribute("endTime", sdf.format(driverActivity.getEndTime()));
DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId).eq("type",1));
@@ -248,7 +248,10 @@
, Integer num8
, Double num9
, Integer num10
- , Double num11) {
+ , Double num11
+ , String num12
+
+ ) {
driverActivityService.insertOrUpdate(null,staTime,startTime, num1, num2
, num3
@@ -259,7 +262,8 @@
, num8
, num9
, num10
- , num11);
+ , num11
+ , num12);
return SUCCESS_TIP;
}
@@ -287,7 +291,9 @@
, Integer num8
, Double num9
, Integer num10
- , Double num11) {
+ , Double num11
+ , String num12
+ ) {
driverActivityService.insertOrUpdate(id,staTime,startTime, num1, num2
, num3
, num4
@@ -297,7 +303,8 @@
, num8
, num9
, num10
- , num11);
+ , num11
+ ,num12);
return SUCCESS_TIP;
}
@RequestMapping(value = "/updateStatus")
--
Gitblit v1.7.1