From f2057bd69558d42de70a4b8a169a2b86e49b9b19 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 16 九月 2025 10:12:48 +0800
Subject: [PATCH] 经停站点
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java
index b738142..8581adb 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java
@@ -7,6 +7,7 @@
import com.stylefeng.guns.core.util.ExcelExportUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.service.ITOrderCrossCityService;
+import com.stylefeng.guns.modular.system.service.ITOrderLogisticsService;
import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@@ -39,6 +40,8 @@
@Resource
private ITOrderCrossCityService orderCrossCityService;
+ @Resource
+ private ITOrderLogisticsService orderLogisticsService;
/**
* 跳转支付订单统计页
@@ -78,7 +81,9 @@
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
List<Map<String, Object>> list1 = orderCrossCityService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
+ List<Map<String, Object>> list2 = orderLogisticsService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
list.addAll(list1);
+ list.addAll(list2);
list.sort((o1, o2) -> {
String insertTime = o1.get("insertTime").toString();
String insertTime1 = o2.get("insertTime").toString();
@@ -112,6 +117,21 @@
HttpServletRequest request, HttpServletResponse response){
Page<Map<String, Object>> page = new Page(1, 9999);
List<Map<String, Object>> list = orderTaxiService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
+ List<Map<String, Object>> list1 = orderCrossCityService.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTime, paymentTime,orderType);
+ list.addAll(list1);
+ list.sort((o1, o2) -> {
+ String insertTime = o1.get("insertTime").toString();
+ String insertTime1 = o2.get("insertTime").toString();
+ Date o1Date = null;
+ Date o2Date = null;
+ try {
+ o1Date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(insertTime);
+ o2Date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(insertTime1);
+ return o2Date.compareTo(o1Date);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ });
// 表格数据【封装】
List<List<String>> dataList = new ArrayList<>();
--
Gitblit v1.7.1