From 9d1267aaf8968cc8fe2a257c33a27fd381288b78 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 六月 2025 13:52:06 +0800
Subject: [PATCH] 管理后台二期
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/FinancialStatementController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 bab993a..e2a9c35 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
@@ -6,6 +6,7 @@
import com.stylefeng.guns.core.util.DateUtil;
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.ITOrderTaxiService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@@ -15,6 +16,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -33,7 +36,9 @@
@Resource
private ITOrderTaxiService orderTaxiService;
-
+ @Resource
+ private ITOrderCrossCityService orderCrossCityService;
+
/**
* 跳转支付订单统计页
@@ -72,6 +77,21 @@
String driverPhone, String createTime, String paymentTime,Integer orderType){
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.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);
+ }
+ });
return super.packForBT(page.setRecords(list));
}
@@ -92,6 +112,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