Pu Zhibing
2025-05-16 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc
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);
    }
@@ -101,6 +97,10 @@
        page.setRecords(tIncomeService.getList(page,id));
        return super.packForBT(page);
    }
    @RequestMapping("/getExcel")
    @ResponseBody
    public void getExcel(
@@ -116,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) {
@@ -134,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("-");
            }