Pu Zhibing
3 天以前 25cf266e99714ac5d428e66b40ce272325c91dd8
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
@@ -125,8 +126,8 @@
        /*if (ShiroKit.getUser().getRoleType() != 1){
            page.setRecords(null);
        }else{*/
        ShiroUser user = ShiroKit.getUser();
        List<Map<String,Object>> list = orderTaxiService.getOrderList(page,beginTime,endTime,ids,type,payType,user.getObjectId());
        ShiroUser user = ShiroExtUtil.getUser();
        List<Map<String, Object>> list = orderTaxiService.getOrderList(page, beginTime, endTime, ids, type, payType, user.getObjectId());
            page.setRecords(list);
       /* }*/
        return super.packForBT(page);
@@ -157,7 +158,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = orderTaxiService.getOrderListEx(beginTime,endTime,ids,type,payType,ShiroKit.getUser().getObjectId());
            List<Map<String, Object>> mapList = orderTaxiService.getOrderListEx(beginTime, endTime, ids, type, payType, ShiroExtUtil.getUser().getObjectId());
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
@@ -271,14 +272,14 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
        if (ShiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        }else{
            List<Map<String,Object>> list = companyService.getCompanyIncomeList(page,beginTime,endTime,ids);
            Map<String,Object> map = new HashMap<>();
            map.put("id","合计");
            map.put("money",companyService.getSumCompanyIncomeMoney(beginTime,endTime,ids));
        } else {
            List<Map<String, Object>> list = companyService.getCompanyIncomeList(page, beginTime, endTime, ids);
            Map<String, Object> map = new HashMap<>();
            map.put("id", "合计");
            map.put("money", companyService.getSumCompanyIncomeMoney(beginTime, endTime, ids));
            list.add(map);
            page.setRecords(list);
        }
@@ -358,12 +359,12 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
            List<Map<String,Object>> list = taxiCardPaymentService.getList(page,beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId());
            Map<String,Object> map = new HashMap<>();
            map.put("id","合计");
            map.put("payMoney",taxiCardPaymentService.getSumMoney(beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId()));
            list.add(map);
        List<Map<String, Object>> list = taxiCardPaymentService.getList(page, beginTime, endTime, ids, type, null, null, null, null, ShiroExtUtil.getUser().getObjectId());
        Map<String, Object> map = new HashMap<>();
        map.put("id", "合计");
        map.put("payMoney", taxiCardPaymentService.getSumMoney(beginTime, endTime, ids, type, null, null, null, null, ShiroExtUtil.getUser().getObjectId()));
        list.add(map);
            page.setRecords(list);
        return super.packForBT(page);
    }
@@ -387,7 +388,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = taxiCardPaymentService.getListEx(beginTime,endTime,ids,type,null,null,null,null,ShiroKit.getUser().getObjectId());
            List<Map<String, Object>> mapList = taxiCardPaymentService.getListEx(beginTime, endTime, ids, type, null, null, null, null, ShiroExtUtil.getUser().getObjectId());
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
@@ -435,14 +436,14 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
        if (ShiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        }else{
            List<Map<String,Object>> list = complaintDeductmoneyService.getList(page,beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId());
            Map<String,Object> map = new HashMap<>();
            map.put("id","合计");
            map.put("money",complaintDeductmoneyService.getSumMoney(beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId()));
        } else {
            List<Map<String, Object>> list = complaintDeductmoneyService.getList(page, beginTime, endTime, ids, null, null, null, ShiroExtUtil.getUser().getObjectId());
            Map<String, Object> map = new HashMap<>();
            map.put("id", "合计");
            map.put("money", complaintDeductmoneyService.getSumMoney(beginTime, endTime, ids, null, null, null, ShiroExtUtil.getUser().getObjectId()));
            list.add(map);
            page.setRecords(list);
        }
@@ -469,7 +470,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String,Object>> mapList = complaintDeductmoneyService.getListEx(beginTime,endTime,ids,null,null,null,ShiroKit.getUser().getObjectId());
            List<Map<String, Object>> mapList = complaintDeductmoneyService.getListEx(beginTime, endTime, ids, null, null, null, ShiroExtUtil.getUser().getObjectId());
            String[][] values = new String[mapList.size()][];
            for (int i = 0; i < mapList.size(); i++) {
@@ -526,14 +527,14 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroKit.getUser().getRoleType() != 1){
        if (ShiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        }else{
            List<Map<String,Object>> list = tPubWithdrawalService.getReportWithdrawalList(page,beginTime,endTime,ids);
            Map<String,Object> map = tPubWithdrawalService.getSumMoney(beginTime,endTime,ids);
            if(map!=null){
                map.put("id","合计");
        } else {
            List<Map<String, Object>> list = tPubWithdrawalService.getReportWithdrawalList(page, beginTime, endTime, ids);
            Map<String, Object> map = tPubWithdrawalService.getSumMoney(beginTime, endTime, ids);
            if (map != null) {
                map.put("id", "合计");
                list.add(map);
            }
            page.setRecords(list);