From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 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 7d8823d..ce5f33c 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,20 +77,20 @@
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));
- model.addAttribute("id1",driverActivityRegistered.getId());
+ model.addAttribute("id1", null == driverActivityRegistered ? 0 : driverActivityRegistered.getId());
driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId).eq("type",2));
- model.addAttribute("id2",driverActivityRegistered.getId());
+ model.addAttribute("id2", null == driverActivityRegistered ? 0 : driverActivityRegistered.getId());
DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",1));
- model.addAttribute("id3",driverActivityOnline.getId());
+ model.addAttribute("id3", null == driverActivityOnline ? 0 : driverActivityOnline.getId());
//统计专车在线
driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
- model.addAttribute("id4",driverActivityOnline.getId());
+ model.addAttribute("id4", null == driverActivityOnline ? 0 : driverActivityOnline.getId());
driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
- model.addAttribute("id5",driverActivityOnline.getId());
+ model.addAttribute("id5", null == driverActivityOnline ? 0 : driverActivityOnline.getId());
DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",activityId));
model.addAttribute("id6",driverActivityOrder.getId());
return PREFIX + "receiveRecord.html";
@@ -149,28 +149,28 @@
}
map.put("money3",money);
map.put("number3",number);
- driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
+// driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
//统计出租车在线
- historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
+// historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
money=0d;
number=0;
- for(DriverActivityHistory history:historyList){
- totalMOney+=history.getMoney();
- money+=history.getMoney();
- number+=1;
- }
+// for(DriverActivityHistory history:historyList){
+// totalMOney+=history.getMoney();
+// money+=history.getMoney();
+// number+=1;
+// }
map.put("money4",money);
map.put("number4",number);
- driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
+// driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
//统计城际在线
- historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
+// historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
money=0d;
number=0;
- for(DriverActivityHistory history:historyList){
- totalMOney+=history.getMoney();
- money+=history.getMoney();
- number+=1;
- }
+// for(DriverActivityHistory history:historyList){
+// totalMOney+=history.getMoney();
+// money+=history.getMoney();
+// number+=1;
+// }
map.put("money5",money);
map.put("number5",number);
DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",activityId));
--
Gitblit v1.7.1