From 0ecd24b3b8101c4717adc2775bbb498261253948 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 08 二月 2025 17:56:17 +0800
Subject: [PATCH] 开发新增加功能
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
index c57276d..32dcae3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
@@ -74,6 +74,7 @@
@ResponseBody
public Object driverWorkDetailList(String times) {
Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+ times = times.split(" ")[0];
page.setRecords(tIncomeService.getList2(page,times));
return super.packForBT(page);
}
@@ -96,6 +97,10 @@
page.setRecords(tIncomeService.getList(page,id));
return super.packForBT(page);
}
+
+
+
+
@RequestMapping("/getExcel")
@ResponseBody
public void getExcel(
@@ -111,7 +116,8 @@
List<String> shellList = new ArrayList<String>();
shellList.add("日期");
shellList.add("活动收入");
- shellList.add("业务收入");
+ shellList.add("在线支付收入");
+ shellList.add("现金支付收入");
dataList.add(shellList);
for (Map<String, Object> map : list) {
@@ -129,8 +135,13 @@
}else{
shellList.add("-");
}
- if(SinataUtil.isNotEmpty(map.get("orderMoney"))){
- shellList.add(map.get("orderMoney").toString());
+ if(SinataUtil.isNotEmpty(map.get("onlineMoney"))){
+ shellList.add(map.get("onlineMoney").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(map.get("cashMoney"))){
+ shellList.add(map.get("cashMoney").toString());
}else{
shellList.add("-");
}
--
Gitblit v1.7.1