From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java | 6 +-----
1 files changed, 1 insertions(+), 5 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 35b8d36..2afd9d5 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
@@ -60,11 +60,6 @@
public Object driverWorkList() {
Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
List<Map<String,Object>> list = tIncomeService.getList1(page);
- for (Map<String,Object> map:list){
- List<Map<String,Object>> list1 = tIncomeService.getTotal(map.get("times").toString());
- map.put("driverNum",list1.get(0).get("driverNum"));
- map.put("timeNumber",list1.get(0).get("timeNumber"));
- }
page.setRecords(list);
return super.packForBT(page);
}
@@ -79,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);
}
--
Gitblit v1.7.1