Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-22 f9fff682ff6b21344401bb86f85d25c97c37b073

 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);
    }