diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java
index 53322fd2..02f8f66b 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java
@@ -11,11 +11,12 @@ import cn.iocoder.yudao.module.rescue.domain.RescueInfo;
 import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto;
 import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto;
 import cn.iocoder.yudao.module.rescue.service.IRescueInfoService;
+import cn.iocoder.yudao.module.rescue.vo.DriverReceiptStatVO;
 import cn.iocoder.yudao.module.rescue.vo.RescueCarStatRespVO;
 import cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO;
-import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
+import cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryDetailVO;
+import cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryVO;
 import cn.iocoder.yudao.module.staff.service.CompanyStaffService;
-import cn.iocoder.yudao.module.staff.vo.CompanyStaffReqVO;
 import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
 import cn.iocoder.yudao.module.system.api.permission.RoleApi;
 import cn.iocoder.yudao.module.system.api.permission.dto.RoleReqDTO;
@@ -23,7 +24,6 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -89,8 +89,8 @@ public class RescueInfoController extends BaseController {
      */
     @GetMapping("/getRescueCarKPI")
     public CommonResult<List<RescueInfo>> getRescueCarKPI(
-            String driverCarNum,String startTime,String endTime,String channel,String secondDispatchName) {
-        List<RescueInfo> list = rescueInfoService.getRescueCarKPI(driverCarNum,startTime,endTime,channel,secondDispatchName);
+            String driverCarNum, String startTime, String endTime, String channel, String secondDispatchName) {
+        List<RescueInfo> list = rescueInfoService.getRescueCarKPI(driverCarNum, startTime, endTime, channel, secondDispatchName);
         return success(list);
     }
 
@@ -148,8 +148,8 @@ public class RescueInfoController extends BaseController {
 
     @GetMapping("/getRescueRevokeList")
     public CommonResult getRescueRevokeList(RescueInfo rescueInfo,
-                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+                                            @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         Page<RescueInfo> page = new Page<>(pageNum, pageSize);
         //获取当前登录用户
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
@@ -314,6 +314,7 @@ public class RescueInfoController extends BaseController {
         List<DriverInfo2Dto> driverList = rescueInfoService.driverInMap(driverInfoDto);
         return success(driverList);
     }
+
     @GetMapping("/secondDriverInMap")
     public CommonResult secondDriverInMap(DriverInfoDto driverInfoDto) {
         List<DriverInfo2Dto> driverList = rescueInfoService.secondDriverInMap(driverInfoDto);
@@ -388,8 +389,8 @@ public class RescueInfoController extends BaseController {
      */
     @GetMapping("/getHcList")
     public CommonResult getHcList(RescueInfo rescueInfo,
-                                  @RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
-                                  @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize) {
+                                  @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         Page<RescueInfo> page = new Page<>(pageNum, pageSize);
         IPage<RescueInfo> rescueInfos = rescueInfoService.getHcList(rescueInfo, page);
         return success(rescueInfos);
@@ -399,12 +400,11 @@ public class RescueInfoController extends BaseController {
      * 获取扣车订单
      */
     @GetMapping("/statisticsInfo")
-    public CommonResult statisticsInfo(String type)  {
+    public CommonResult statisticsInfo(String type) {
         return success(rescueInfoService.statisticsInfo(type));
     }
 
 
-
     @PostMapping("/toRepair")
     public CommonResult toRepair(@RequestBody RepairBookingRespVO repairBookingRespVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
@@ -449,14 +449,39 @@ public class RescueInfoController extends BaseController {
         return success(rescueInfoService.statisticsAllSecond(statisticsStaffReqVO));
     }
 
+    /**
+     * 待收款明细统计 app端
+     */
+    @GetMapping("/moneySummary")
+    public CommonResult moneySummary(DriverSummaryVO driverSummaryVO) {
+        return success(rescueInfoService.moneySummary(driverSummaryVO));
+    }
+
+    /**
+     * 明细详情 app端
+     */
+    @GetMapping("/moneySummaryDetail")
+    public CommonResult moneySummaryDetail(DriverSummaryDetailVO driverSummaryDetailVO) {
+        return success(rescueInfoService.moneySummaryDetail(driverSummaryDetailVO));
+    }
+
+    /**
+     * 司机收款统计（汇总 + 渠道明细）PC端
+     */
+    @GetMapping("/getRescueStatisticsInfoByDriver")
+    public CommonResult getRescueStatisticsInfoByDriver(DriverReceiptStatVO query) {
+        // query 里包含时间区间 / 司机姓名等筛选条件
+        return CommonResult.success(rescueInfoService.getRescueStatisticsInfoByDriver(query));
+    }
+
 
     /**
      * App首页数据统计工单列表数据
      */
     @GetMapping("/getRescueStatisticsInfoList")
     public CommonResult getRescueStatisticsInfoList(RescueInfo rescueInfo,
-                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+                                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         Page<RescueInfo> page = new Page<>(pageNum, pageSize);
         //获取当前登录用户
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java
index 8eb1351a..29ca174e 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueInfoMapper.java
@@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.rescue.domain.RescueInfo;
 import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto;
 import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto;
 import cn.iocoder.yudao.module.rescue.vo.*;
+import cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryDetailVO;
+import cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryVO;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -143,4 +145,11 @@ public interface RescueInfoMapper extends BaseMapper<RescueInfo>
             @Param("secondDispatchName") String secondDispatchName
     );
 
+    List<DriverReceiptStatVO> selectDriverReceiptStats(DriverReceiptStatVO query);
+
+    List<ChannelReceiptStatVO> selectChannelReceiptStats(DriverReceiptStatVO query);
+
+    List<DriverSummaryVO> moneySummary(DriverSummaryVO driverSummaryVO);
+
+    List<DriverSummaryDetailVO> moneySummaryDetail(DriverSummaryDetailVO driverSummaryDetailVO);
 }
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java
index 0ffb8bb7..8716a50b 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java
@@ -8,6 +8,8 @@ import cn.iocoder.yudao.module.rescue.domain.RescueInfo;
 import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto;
 import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto;
 import cn.iocoder.yudao.module.rescue.vo.*;
+import cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryDetailVO;
+import cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryVO;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -215,4 +217,10 @@ public interface IRescueInfoService extends IService<RescueInfo>
     List<RescueCarStatRespVO> getRescueCarAgeAndMileage();
 
     List<RescueInfo> getRescueCarKPI(String driverCarNum,String startTime,String endTime,String channel,String secondDispatchName);
+
+    List<DriverReceiptStatVO> getRescueStatisticsInfoByDriver(DriverReceiptStatVO query);
+
+    List<DriverSummaryVO> moneySummary(DriverSummaryVO driverSummaryVO);
+
+    List<DriverSummaryDetailVO> moneySummaryDetail(DriverSummaryDetailVO driverSummaryDetailVO);
 }
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueBusinessStatisticsServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueBusinessStatisticsServiceImpl.java
index 4dbd081a..54615af7 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueBusinessStatisticsServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueBusinessStatisticsServiceImpl.java
@@ -136,7 +136,8 @@ public class RescueBusinessStatisticsServiceImpl implements RescueBusinessStatis
                 .collect(Collectors.toList());
 
         // 3. 批量翻译
-        Map<String, String> dict = dictDataService.getDictDataLabels("jyc_type", codes);
+//        Map<String, String> dict = dictDataService.getDictDataLabels("jyc_type", codes);
+        Map<String, String> dict = dictDataService.getDictDataLabels("rescue_car_type", codes);
 
         // 4. 设置中文，并兜底空值
         items.forEach(i -> {
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
index b17fd8fc..d0526add 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java
@@ -27,6 +27,8 @@ import cn.iocoder.yudao.module.rescue.utils.RedisUtil;
 import cn.iocoder.yudao.module.rescue.utils.RedissonDelayQueue;
 import cn.iocoder.yudao.module.rescue.utils.StringUtils;
 import cn.iocoder.yudao.module.rescue.vo.*;
+import cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryDetailVO;
+import cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryVO;
 import cn.iocoder.yudao.module.staff.entity.CompanyStaff;
 import cn.iocoder.yudao.module.staff.service.CompanyStaffService;
 import cn.iocoder.yudao.module.staff.vo.CompanyStaffRespVO;
@@ -60,6 +62,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -3108,6 +3111,111 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
         return baseMapper.getRescueCarKPI(driverCarNum,startTime,endTime,channel,secondDispatchName);
     }
 
+    @Override
+    public List<DriverReceiptStatVO> getRescueStatisticsInfoByDriver(DriverReceiptStatVO query) {
+        String startTime = "";
+        String endTime = "";
+        if ("more".equals(query.getTimeType())) {
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(query.getStartTimeStr())) {
+                startTime = query.getStartTimeStr() + " 00:00:00";
+            }
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(query.getEndTimeStr())) {
+                endTime = query.getEndTimeStr() + " 23:59:59";
+            }
+        } else if ("month".equals(query.getTimeType())) {
+            //当月
+            startTime = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:00";
+            endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59";
+        } else if ("day".equals(query.getTimeType())) {
+            //当天
+            startTime = DateUtil.formatDate(DateUtil.date()) + " 00:00:00";
+            endTime = DateUtil.formatDate(DateUtil.date()) + " 23:59:59";
+        }else if ("year".equals(query.getTimeType())) {
+            // 当年
+            startTime = DateUtil.format(DateUtil.beginOfYear(DateUtil.date()), "yyyy-MM-dd") + " 00:00:00";
+            endTime = DateUtil.format(DateUtil.endOfYear(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59";
+        }
+        query.setStartTimeStr(startTime);
+        query.setEndTimeStr(endTime);
+
+        // ① 先查司机层汇总
+        List<DriverReceiptStatVO> drivers = baseMapper.selectDriverReceiptStats(query);
+
+        if (CollectionUtils.isEmpty(drivers)) {
+            return drivers;
+        }
+
+        // ② 再为每个司机查渠道明细
+        return drivers.stream().peek(d -> {
+            DriverReceiptStatVO param = new DriverReceiptStatVO();
+            param.setDriverName(d.getDriverName());
+            param.setStartTimeStr(query.getStartTimeStr());
+            param.setEndTimeStr(query.getEndTimeStr());
+            List<ChannelReceiptStatVO> channels = baseMapper.selectChannelReceiptStats(param);
+            d.setChannels(channels);
+        }).collect(Collectors.toList());
+
+    }
+
+    @Override
+    public List<DriverSummaryVO> moneySummary(DriverSummaryVO driverSummaryVO) {
+        String startTime = "";
+        String endTime = "";
+        if ("more".equals(driverSummaryVO.getTimeType())) {
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(driverSummaryVO.getStartTimeStr())) {
+                startTime = driverSummaryVO.getStartTimeStr() + " 00:00:00";
+            }
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(driverSummaryVO.getEndTimeStr())) {
+                endTime = driverSummaryVO.getEndTimeStr() + " 23:59:59";
+            }
+        } else if ("month".equals(driverSummaryVO.getTimeType())) {
+            //当月
+            startTime = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:00";
+            endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59";
+        } else if ("day".equals(driverSummaryVO.getTimeType())) {
+            //当天
+            startTime = DateUtil.formatDate(DateUtil.date()) + " 00:00:00";
+            endTime = DateUtil.formatDate(DateUtil.date()) + " 23:59:59";
+        }else if ("year".equals(driverSummaryVO.getTimeType())) {
+            // 当年
+            startTime = DateUtil.format(DateUtil.beginOfYear(DateUtil.date()), "yyyy-MM-dd") + " 00:00:00";
+            endTime = DateUtil.format(DateUtil.endOfYear(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59";
+        }
+        driverSummaryVO.setStartTimeStr(startTime);
+        driverSummaryVO.setEndTimeStr(endTime);
+
+        return baseMapper.moneySummary(driverSummaryVO);
+    }
+
+    @Override
+    public List<DriverSummaryDetailVO> moneySummaryDetail(DriverSummaryDetailVO driverSummaryDetailVO) {
+        String startTime = "";
+        String endTime = "";
+        if ("more".equals(driverSummaryDetailVO.getTimeType())) {
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(driverSummaryDetailVO.getStartTimeStr())) {
+                startTime = driverSummaryDetailVO.getStartTimeStr() + " 00:00:00";
+            }
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(driverSummaryDetailVO.getEndTimeStr())) {
+                endTime = driverSummaryDetailVO.getEndTimeStr() + " 23:59:59";
+            }
+        } else if ("month".equals(driverSummaryDetailVO.getTimeType())) {
+            //当月
+            startTime = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:00";
+            endTime = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59";
+        } else if ("day".equals(driverSummaryDetailVO.getTimeType())) {
+            //当天
+            startTime = DateUtil.formatDate(DateUtil.date()) + " 00:00:00";
+            endTime = DateUtil.formatDate(DateUtil.date()) + " 23:59:59";
+        }else if ("year".equals(driverSummaryDetailVO.getTimeType())) {
+            // 当年
+            startTime = DateUtil.format(DateUtil.beginOfYear(DateUtil.date()), "yyyy-MM-dd") + " 00:00:00";
+            endTime = DateUtil.format(DateUtil.endOfYear(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59";
+        }
+        driverSummaryDetailVO.setStartTimeStr(startTime);
+        driverSummaryDetailVO.setEndTimeStr(endTime);
+        return baseMapper.moneySummaryDetail(driverSummaryDetailVO);
+    }
+
 
     public List<StatisticsStaffVO> driverStatisticsSecond(StatisticsStaffVO statisticsStaffReqVO) {
         return baseMapper.driverStatisticsSecond(statisticsStaffReqVO);
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/ChannelReceiptStatVO.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/ChannelReceiptStatVO.java
new file mode 100644
index 00000000..97ced5c8
--- /dev/null
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/ChannelReceiptStatVO.java
@@ -0,0 +1,39 @@
+package cn.iocoder.yudao.module.rescue.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 司机收款统计 - 渠道明细 VO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChannelReceiptStatVO {
+
+    /** 渠道名称（空或 NULL 统一映射成“未知渠道”） */
+    private String channel;
+
+    /** 救援单总数 */
+    private Integer orderCount;
+
+    /** 应收金额(元) */
+    private BigDecimal yingskNum;
+    /** 应收单数 */
+    private Integer yingskNumOrderCount;
+
+    /** 已收金额(元) */
+    private BigDecimal yiskNum;
+    /** 已收单数 */
+    private Integer yiskNumOrderCount;
+
+    /** 待收金额(元) */
+    private BigDecimal dskNum;
+    /** 待收单数 */
+    private Integer dskNumOrderCount;
+}
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/DriverReceiptStatVO.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/DriverReceiptStatVO.java
new file mode 100644
index 00000000..888480b8
--- /dev/null
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/DriverReceiptStatVO.java
@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.rescue.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 司机收款统计 - 司机汇总 VO
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DriverReceiptStatVO {
+    /** 司机主键 ID */
+    private Long driverId;
+
+    /** 司机姓名 */
+    private String driverName;
+    private String driverType;
+
+    /** 应收金额(元) */
+    private BigDecimal yingskNum;
+    /** 应收单数 */
+    private Integer yingskNumOrderCount;
+
+    /** 已收金额(元) */
+    private BigDecimal yiskNum;
+    /** 已收单数 */
+    private Integer yiskNumOrderCount;
+
+    /** 待收金额(元) */
+    private BigDecimal dskNum;
+    /** 待收单数 */
+    private Integer dskNumOrderCount;
+
+    /** ↓↓↓ 渠道明细列表，可为空 */
+    private List<ChannelReceiptStatVO> channels;
+
+    /**
+     * 筛选时间类型
+     */
+    @TableField(exist = false)
+    private String timeType;
+
+    /**
+     * 筛选开始时间
+     */
+    @TableField(exist = false)
+    private String startTimeStr;
+
+    /**
+     * 筛选结束时间
+     */
+    @TableField(exist = false)
+    private String endTimeStr;
+}
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/money/DriverSummaryDetailVO.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/money/DriverSummaryDetailVO.java
new file mode 100644
index 00000000..021f522a
--- /dev/null
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/money/DriverSummaryDetailVO.java
@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.rescue.vo.money;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class DriverSummaryDetailVO {
+    /** 司机姓名（冗余，方便前端展示） */
+    private String driverName;
+    private String secondDispatchName;
+    private String toScene;
+    private String toRepair;
+    private String source;
+    private String faultType;
+    private String rescuePosition;
+    private String carBrand;
+    private String carType;
+    private String estimateDownCar;
+    private String ifNewEnergy;
+    private String rescueType;
+    private String feeType;
+    private String isKouChe;
+    private String transferReason;
+    private String driverCarNum;
+
+    /** 客户车牌 */
+    private String licenseNum;
+
+    /** 救援日期（仅日期即可；如需时分秒可改 LocalDateTime） */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate rescueTime;
+
+    /** 应收款 */
+    private BigDecimal setMoney;
+
+    /** 渠道（例：沪渝高速） */
+    private String channel;
+    /** 救援状态 */
+    private String rescueStatus;
+
+    /** 筛选时间类型*/
+    private String timeType;
+
+    /** 筛选开始时间 */
+    @TableField(exist = false)
+    private String startTimeStr;
+
+    /** 筛选结束时间 */
+    @TableField(exist = false)
+    private String endTimeStr;
+}
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/money/DriverSummaryVO.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/money/DriverSummaryVO.java
new file mode 100644
index 00000000..039b1bd1
--- /dev/null
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/vo/money/DriverSummaryVO.java
@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.rescue.vo.money;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class DriverSummaryVO {
+    /** 司机姓名 */
+    private String driverName;
+    private String secondDispatchName;
+    private String driverCarNum;
+    private String toScene;
+    private String toRepair;
+    private String channel;
+    private String source;
+    private String faultType;
+    private String rescuePosition;
+    private String carBrand;
+    private String carType;
+    private String estimateDownCar;
+    private String ifNewEnergy;
+    private String rescueType;
+    private String feeType;
+    private String isKouChe;
+    private String transferReason;
+
+    private Integer dqcNum;
+
+    /** 应收金额(元) */
+    private BigDecimal yingskNum;
+    /** 应收单数 */
+    private Integer yingskNumOrderCount;
+
+    /** 已收金额(元) */
+    private BigDecimal yiskNum;
+    /** 已收单数 */
+    private Integer yiskNumOrderCount;
+
+    /** 待收金额(元) */
+    private BigDecimal dskNum;
+    /** 待收单数 */
+    private Integer dskNumOrderCount;
+
+    /** 该司机救援数量 */
+    private Integer rescueNum;
+    /** 救援状态 */
+    private String rescueStatus;
+
+    /** 筛选时间类型*/
+    private String timeType;
+
+    /** 筛选开始时间 */
+    private String startTimeStr;
+
+    /** 筛选结束时间 */
+    private String endTimeStr;
+}
diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml
index c8c79f3a..c37465c8 100644
--- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml
+++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml
@@ -26,7 +26,8 @@
                 <choose>
                     <when test="map.rescueStatus == '1'.toString()">
                         <!-- 救援中 -->
-                        and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3' or ri.rescue_status = '4')
+                        and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3' or
+                        ri.rescue_status = '4')
                     </when>
                     <when test="map.rescueStatus == '2'.toString()">
                         <!--待支付 -->
@@ -66,9 +67,9 @@
                     </when>
                 </choose>
             </if>
-           <!-- <if test="map.licenseNum != null">
-                and ri.license_num like concat('%', #{map.licenseNum}, '%')
-            </if>-->
+            <!-- <if test="map.licenseNum != null">
+                 and ri.license_num like concat('%', #{map.licenseNum}, '%')
+             </if>-->
             <if test="map.licenseNum != null and map.licenseNum != ''">
                 and (ri.license_num like concat('%', #{map.licenseNum}, '%')
                 or ri.connection_phone like concat('%', #{map.licenseNum}, '%')
@@ -133,14 +134,14 @@
             </if>
             <if test="map.transferReason != null and map.transferReason != '' ">
                 AND EXISTS (
-                    SELECT 1
-                        FROM rescue_info_detail rd
-                            WHERE rd.rescue_info_id = ri.id AND rd.deleted = '0'
-                                AND rd.title   = '车辆移交'
-                                AND rd.auto_remark LIKE '%移交事由:%'
-                                AND TRIM(SUBSTRING_INDEX(SUBSTRING_INDEX(
-                                rd.auto_remark, '移交事由:', -1), ',', 1))
-                                = #{map.transferReason}
+                SELECT 1
+                FROM rescue_info_detail rd
+                WHERE rd.rescue_info_id = ri.id AND rd.deleted = '0'
+                AND rd.title = '车辆移交'
+                AND rd.auto_remark LIKE '%移交事由:%'
+                AND TRIM(SUBSTRING_INDEX(SUBSTRING_INDEX(
+                rd.auto_remark, '移交事由:', -1), ',', 1))
+                = #{map.transferReason}
                 )
             </if>
 
@@ -171,7 +172,8 @@
                 <choose>
                     <when test="map.rescueStatus == '1'.toString()">
                         <!-- 救援中 -->
-                        and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3' or ri.rescue_status = '4')
+                        and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3' or
+                        ri.rescue_status = '4')
                     </when>
                     <when test="map.rescueStatus == '2'.toString()">
                         <!--待支付 -->
@@ -187,7 +189,7 @@
                     </when>
                     <when test="map.rescueStatus == '5'.toString()">
                         <!--  评价 -->
---                         and roi.order_status = '3'
+                        -- and roi.order_status = '3'
                         and (ri.rescue_status = '5' or ri.rescue_status = '8' or roi.order_status = '3')
                     </when>
                     <when test="map.rescueStatus == '8'.toString()">
@@ -276,7 +278,8 @@
         order by ri.create_time desc
     </select>
 
-    <select id="selectRescueInfoRevokeListSecondDispatcher" parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo"
+    <select id="selectRescueInfoRevokeListSecondDispatcher"
+            parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo"
             resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
         SELECT ri.*,
         roi.order_status,
@@ -312,22 +315,24 @@
 
     <select id="selectRescueInfoAndOrderById" resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
         SELECT ri.*,
-        roi.order_status,
-        roi.set_money,
-        roi.id as rescueOrderId,
-        roi.pay_type,
-        roi.pay_money,
-        roi.pay_time,
-        roi.order_signing_person_name,
-        roi.order_signing_charge_name,
-        roi.order_signing_remark,
-        roi.if_confirm_pay,
-        roi.confirm_payment_person_name,
-        roi.confirm_payment_time,
-        roi.confirm_payment_person_remark
+               roi.order_status,
+               roi.set_money,
+               roi.id as rescueOrderId,
+               roi.pay_type,
+               roi.pay_money,
+               roi.pay_time,
+               roi.order_signing_person_name,
+               roi.order_signing_charge_name,
+               roi.order_signing_remark,
+               roi.if_confirm_pay,
+               roi.confirm_payment_person_name,
+               roi.confirm_payment_time,
+               roi.confirm_payment_person_remark
         FROM rescue_info ri
-        left join rescue_order_info roi on roi.rescue_info_id = ri.id
-        where ri.deleted = '0' AND ri.is_revoke = '0' and ri.id = #{id}
+                 left join rescue_order_info roi on roi.rescue_info_id = ri.id
+        where ri.deleted = '0'
+          AND ri.is_revoke = '0'
+          and ri.id = #{id}
         order by ri.create_time desc
     </select>
 
@@ -615,8 +620,8 @@
         INNER JOIN system_users su ON di.user_id = su.id
         AND su.deleted = '0'
         WHERE 1 = 1
-          AND di.deleted = '0'
-          AND di.staff_type = 'jysj'
+        AND di.deleted = '0'
+        AND di.staff_type = 'jysj'
         <if test="map.nickName != null and map.nickName != ''">
             and su.nickname like concat('%', #{map.nickName}, '%')
         </if>
@@ -716,11 +721,13 @@
         rdcr.driver_id,
         COALESCE(
         MAX(CASE WHEN rdcr.is_primary = 1 THEN rci.rescue_car_num END),
-        SUBSTRING_INDEX(GROUP_CONCAT(rci.rescue_car_num ORDER BY rdcr.is_primary DESC, rdcr.create_time SEPARATOR ','), ',', 1)
+        SUBSTRING_INDEX(GROUP_CONCAT(rci.rescue_car_num ORDER BY rdcr.is_primary DESC, rdcr.create_time SEPARATOR ','),
+        ',', 1)
         ) as rescue_car_num,
         COALESCE(
         MAX(CASE WHEN rdcr.is_primary = 1 THEN rci.car_category END),
-        SUBSTRING_INDEX(GROUP_CONCAT(rci.car_category ORDER BY rdcr.is_primary DESC, rdcr.create_time SEPARATOR ','), ',', 1)
+        SUBSTRING_INDEX(GROUP_CONCAT(rci.car_category ORDER BY rdcr.is_primary DESC, rdcr.create_time SEPARATOR ','),
+        ',', 1)
         ) as driver_car_category
         FROM
         rescue_driver_car_relation rdcr
@@ -826,11 +833,13 @@
         rdcr.driver_id,
         COALESCE(
         MAX(CASE WHEN rdcr.is_primary = 1 THEN rci.rescue_car_num END),
-        SUBSTRING_INDEX(GROUP_CONCAT(rci.rescue_car_num ORDER BY rdcr.is_primary DESC, rdcr.create_time SEPARATOR ','), ',', 1)
+        SUBSTRING_INDEX(GROUP_CONCAT(rci.rescue_car_num ORDER BY rdcr.is_primary DESC, rdcr.create_time SEPARATOR ','),
+        ',', 1)
         ) as rescue_car_num,
         COALESCE(
         MAX(CASE WHEN rdcr.is_primary = 1 THEN rci.car_category END),
-        SUBSTRING_INDEX(GROUP_CONCAT(rci.car_category ORDER BY rdcr.is_primary DESC, rdcr.create_time SEPARATOR ','), ',', 1)
+        SUBSTRING_INDEX(GROUP_CONCAT(rci.car_category ORDER BY rdcr.is_primary DESC, rdcr.create_time SEPARATOR ','),
+        ',', 1)
         ) as driver_car_category
         FROM
         rescue_driver_car_relation rdcr
@@ -860,7 +869,6 @@
     </select>
 
 
-
     <select id="driverInMap2" resultType="java.util.Map">
         SELECT IFNULL(sum(di.driver_status = '1'), 0) as kxNum,
                IFNULL(sum(di.driver_status = '2'), 0) as ztNum,
@@ -919,12 +927,12 @@
         FROM rescue_info ri
         left join rescue_order_info roi on roi.rescue_info_id = ri.id AND roi.deleted = 0
         where 1 = 1 AND ri.deleted = 0 AND ri.is_revoke = 0
-        <if test="map.deptList != null and map.deptList.size()>0">
+<!--        <if test="map.deptList != null and map.deptList.size()>0">
             and ri.dept_id in
             <foreach collection="map.deptList" separator="," item="item" open="(" close=")">
                 #{item}
             </foreach>
-        </if>
+        </if>-->
         <if test="map.startTimeStr!=null and map.startTimeStr!='' ">
             AND ri.create_time &gt;= #{map.startTimeStr}
         </if>
@@ -961,7 +969,7 @@
         FROM rescue_info ri
         left join rescue_order_info roi on roi.rescue_info_id = ri.id AND roi.deleted = 0
         where 1 = 1 AND ri.deleted = 0 AND ri.is_revoke = 0
-          AND ri.second_dispatch_id = #{map.userId}
+        AND ri.second_dispatch_id = #{map.userId}
         <if test="map.deptList != null and map.deptList.size()>0">
             and ri.dept_id in
             <foreach collection="map.deptList" separator="," item="item" open="(" close=")">
@@ -1182,7 +1190,12 @@
     </select>
 
     <update id="revokeRescueInfo">
-        update rescue_info set is_revoke = 1,revoke_user_id = #{userId},revoke_user_name = #{userName}, revoke_time = #{time} where id = #{id}
+        update rescue_info
+        set is_revoke        = 1,
+            revoke_user_id   = #{userId},
+            revoke_user_name = #{userName},
+            revoke_time      = #{time}
+        where id = #{id}
     </update>
     <update id="updateBilled">
         update rescue_order_info
@@ -1199,28 +1212,28 @@
     <select id="driverStatistics" parameterType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO"
             resultType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO">
         SELECT
-            su.id AS userId,
-            su.avatar,
-            ri.driver_name,
-            di.id AS driver_id,
-            COUNT(ri.id) AS rescueNum,
-            COALESCE(SUM(
-                             CASE
-                                 WHEN ri.end_scale IS NOT NULL
-                                     AND ri.start_scale IS NOT NULL
-                                     AND ri.end_scale > ri.start_scale
-                                     THEN ri.end_scale - ri.start_scale
-                                 ELSE 0
-                                 END
-                     ), 0) AS mileage,
-            COALESCE(SUM(roi.set_money), 0) AS money
+        su.id AS userId,
+        su.avatar,
+        ri.driver_name,
+        di.id AS driver_id,
+        COUNT(ri.id) AS rescueNum,
+        COALESCE(SUM(
+        CASE
+        WHEN ri.end_scale IS NOT NULL
+        AND ri.start_scale IS NOT NULL
+        AND ri.end_scale > ri.start_scale
+        THEN ri.end_scale - ri.start_scale
+        ELSE 0
+        END
+        ), 0) AS mileage,
+        COALESCE(SUM(roi.set_money), 0) AS money
         FROM driver_info di
-                 INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = 0
-                 LEFT JOIN rescue_info ri ON di.id = ri.driver_id AND ri.deleted = 0 and ri.is_revoke = 0
-                 LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
+        INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = 0
+        LEFT JOIN rescue_info ri ON di.id = ri.driver_id AND ri.deleted = 0 and ri.is_revoke = 0
+        LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
         WHERE di.deleted = 0
-          AND ri.driver_id IS NOT NULL
-          AND ri.driver_name IS NOT NULL
+        AND ri.driver_id IS NOT NULL
+        AND ri.driver_name IS NOT NULL
         <if test="vo.startTimeStr!=null and vo.startTimeStr!='' ">
             AND ri.rescue_time &gt;= #{vo.startTimeStr}
         </if>
@@ -1231,34 +1244,34 @@
             AND di.driver_type = #{vo.driverType}
         </if>
         GROUP BY
-            su.id,
-            su.avatar,
-            ri.driver_name,
-            di.id
+        su.id,
+        su.avatar,
+        ri.driver_name,
+        di.id
         ORDER BY rescueNum DESC
     </select>
 
     <select id="carStatistics" parameterType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO"
             resultType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO">
         SELECT
-            rci.rescue_car_num AS driver_car_num,
-            COUNT(ri.id) AS rescueNum,
-            COALESCE(SUM(
-                             CASE
-                                 WHEN ri.end_scale IS NOT NULL
-                                     AND ri.start_scale IS NOT NULL
-                                     AND ri.end_scale > ri.start_scale
-                                     THEN ri.end_scale - ri.start_scale
-                                 ELSE 0
-                                 END
-                     ), 0) AS mileage,
-            COALESCE(SUM(roi.set_money), 0) AS money
+        rci.rescue_car_num AS driver_car_num,
+        COUNT(ri.id) AS rescueNum,
+        COALESCE(SUM(
+        CASE
+        WHEN ri.end_scale IS NOT NULL
+        AND ri.start_scale IS NOT NULL
+        AND ri.end_scale > ri.start_scale
+        THEN ri.end_scale - ri.start_scale
+        ELSE 0
+        END
+        ), 0) AS mileage,
+        COALESCE(SUM(roi.set_money), 0) AS money
         FROM
-            rescue_car_info rci
-                LEFT JOIN rescue_info ri ON rci.rescue_car_num = ri.driver_car_num AND ri.deleted = 0
-                LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
+        rescue_car_info rci
+        LEFT JOIN rescue_info ri ON rci.rescue_car_num = ri.driver_car_num AND ri.deleted = 0
+        LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
         WHERE
-            rci.deleted = 0 and ri.is_revoke = 0
+        rci.deleted = 0 and ri.is_revoke = 0
         <if test="vo.startTimeStr!=null and vo.startTimeStr!='' ">
             AND ri.rescue_time &gt;= #{vo.startTimeStr}
         </if>
@@ -1269,70 +1282,70 @@
             AND rci.rescue_car_own = #{vo.rescueCarOwn}
         </if>
         GROUP BY
-            rci.rescue_car_num
+        rci.rescue_car_num
         ORDER BY
-            rescueNum DESC
+        rescueNum DESC
     </select>
 
-<!--    <select id="dispatchStatistics" parameterType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO"-->
-<!--            resultType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO">-->
-<!--        SELECT-->
-<!--            u.id AS userId,-->
-<!--            u.nickname AS driverName,-->
-<!--            COUNT(r.id) AS createRescueNum,-->
-<!--            SUM(CASE WHEN r.is_dispatched_to_scene = '1' THEN 1 ELSE 0 END) AS toSceneNum,-->
-<!--            SUM(CASE WHEN r.is_wei_xiu = '1' THEN 1 ELSE 0 END) AS toRepairNum,-->
-<!--            SUM(CASE WHEN r.rescue_status = '7' THEN 1 ELSE 0 END) AS confirmCompleteNum-->
-<!--        FROM-->
-<!--            rescue_info r-->
-<!--                INNER JOIN system_users u ON u.id = r.creator AND u.deleted = 0-->
-<!--        WHERE-->
-<!--            r.deleted = 0-->
-<!--        <if test="vo.startTimeStr!=null and vo.startTimeStr!='' ">-->
-<!--            AND r.rescue_time &gt;= #{vo.startTimeStr}-->
-<!--        </if>-->
-<!--        <if test="vo.endTimeStr!=null and vo.endTimeStr!='' ">-->
-<!--            AND r.rescue_time &lt;= #{vo.endTimeStr}-->
-<!--        </if>-->
-<!--        GROUP BY-->
-<!--            u.id, u.nickname-->
-<!--        HAVING-->
-<!--            COUNT(r.id) > 0-->
-<!--        ORDER BY-->
-<!--            createRescueNum DESC;-->
-<!--    </select>-->
+    <!--    <select id="dispatchStatistics" parameterType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO"-->
+    <!--            resultType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO">-->
+    <!--        SELECT-->
+    <!--            u.id AS userId,-->
+    <!--            u.nickname AS driverName,-->
+    <!--            COUNT(r.id) AS createRescueNum,-->
+    <!--            SUM(CASE WHEN r.is_dispatched_to_scene = '1' THEN 1 ELSE 0 END) AS toSceneNum,-->
+    <!--            SUM(CASE WHEN r.is_wei_xiu = '1' THEN 1 ELSE 0 END) AS toRepairNum,-->
+    <!--            SUM(CASE WHEN r.rescue_status = '7' THEN 1 ELSE 0 END) AS confirmCompleteNum-->
+    <!--        FROM-->
+    <!--            rescue_info r-->
+    <!--                INNER JOIN system_users u ON u.id = r.creator AND u.deleted = 0-->
+    <!--        WHERE-->
+    <!--            r.deleted = 0-->
+    <!--        <if test="vo.startTimeStr!=null and vo.startTimeStr!='' ">-->
+    <!--            AND r.rescue_time &gt;= #{vo.startTimeStr}-->
+    <!--        </if>-->
+    <!--        <if test="vo.endTimeStr!=null and vo.endTimeStr!='' ">-->
+    <!--            AND r.rescue_time &lt;= #{vo.endTimeStr}-->
+    <!--        </if>-->
+    <!--        GROUP BY-->
+    <!--            u.id, u.nickname-->
+    <!--        HAVING-->
+    <!--            COUNT(r.id) > 0-->
+    <!--        ORDER BY-->
+    <!--            createRescueNum DESC;-->
+    <!--    </select>-->
     <select id="dispatchStatistics" parameterType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO"
             resultType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO">
         SELECT
-            u.id AS userId,
-            u.nickname AS driverName,
-            COUNT(r.id) AS createRescueNum,
-            SUM(CASE WHEN r.is_dispatched_to_scene = '1' THEN 1 ELSE 0 END) AS toSceneNum,
-            SUM(CASE WHEN r.is_wei_xiu = '1' THEN 1 ELSE 0 END) AS toRepairNum,
-            SUM(CASE WHEN r.rescue_status = '5' THEN 1 ELSE 0 END) AS confirmCompleteNum
+        u.id AS userId,
+        u.nickname AS driverName,
+        COUNT(r.id) AS createRescueNum,
+        SUM(CASE WHEN r.is_dispatched_to_scene = '1' THEN 1 ELSE 0 END) AS toSceneNum,
+        SUM(CASE WHEN r.is_wei_xiu = '1' THEN 1 ELSE 0 END) AS toRepairNum,
+        SUM(CASE WHEN r.rescue_status = '5' THEN 1 ELSE 0 END) AS confirmCompleteNum
         FROM
-            rescue_info r
-                INNER JOIN system_users u ON u.id = r.second_dispatch_id AND u.deleted = 0
+        rescue_info r
+        INNER JOIN system_users u ON u.id = r.second_dispatch_id AND u.deleted = 0
         WHERE
-            r.deleted = 0
-          AND r.is_revoke = 0
-          AND u.id IN (
-            SELECT user_id
-            FROM system_user_role sur
-            WHERE sur.tenant_id = #{vo.tenantId}
-            AND sur.deleted = 0
-            <if test="vo.roleCode != null and vo.roleCode != ''">
-                AND sur.role_id = (
-                SELECT id FROM system_role WHERE `code` = #{vo.roleCode} AND tenant_id = #{vo.tenantId} AND deleted = 0
-                )
-            </if>
-            <if test="vo.roleCode == null or vo.roleCode == ''">
-                -- 当没有传入roleCode时，查询ddzx和second_dispatcher角色
-                AND sur.role_id IN (
-                SELECT id FROM system_role WHERE `code` IN ('ddzx', 'second_dispatcher')
-                AND tenant_id = #{vo.tenantId} AND deleted = 0
-                )
-            </if>
+        r.deleted = 0
+        AND r.is_revoke = 0
+        AND u.id IN (
+        SELECT user_id
+        FROM system_user_role sur
+        WHERE sur.tenant_id = #{vo.tenantId}
+        AND sur.deleted = 0
+        <if test="vo.roleCode != null and vo.roleCode != ''">
+            AND sur.role_id = (
+            SELECT id FROM system_role WHERE `code` = #{vo.roleCode} AND tenant_id = #{vo.tenantId} AND deleted = 0
+            )
+        </if>
+        <if test="vo.roleCode == null or vo.roleCode == ''">
+            -- 当没有传入roleCode时，查询ddzx和second_dispatcher角色
+            AND sur.role_id IN (
+            SELECT id FROM system_role WHERE `code` IN ('ddzx', 'second_dispatcher')
+            AND tenant_id = #{vo.tenantId} AND deleted = 0
+            )
+        </if>
         )
         <if test="vo.startTimeStr!=null and vo.startTimeStr!='' ">
             AND r.rescue_time &gt;= #{vo.startTimeStr}
@@ -1341,30 +1354,31 @@
             AND r.rescue_time &lt;= #{vo.endTimeStr}
         </if>
         GROUP BY
-            u.id, u.nickname
+        u.id, u.nickname
         HAVING
-            COUNT(r.id) > 0
+        COUNT(r.id) > 0
         ORDER BY
-            createRescueNum DESC;
+        createRescueNum DESC;
     </select>
     <select id="getAllRescueOrder" resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
         SELECT ri.*,
                roi.order_status,
                roi.set_money,
-               roi.id AS orderId,
-               roi.order_signing_person_id AS orderSigningPersonId,
+               roi.id                        AS orderId,
+               roi.order_signing_person_id   AS orderSigningPersonId,
                roi.order_signing_person_name AS orderSigningPersonName,
-               roi.order_signing_charge_id AS orderSigningChargeId,
+               roi.order_signing_charge_id   AS orderSigningChargeId,
                roi.order_signing_charge_name AS orderSigningChargeName,
-               roi.validation_real_name AS orderSigningRealName,
-               roi.payment_name AS paymentName,
-               roi.payment_time AS paymentTime,
-               roi.order_signing_remark AS orderSigningRemark
+               roi.validation_real_name      AS orderSigningRealName,
+               roi.payment_name              AS paymentName,
+               roi.payment_time              AS paymentTime,
+               roi.order_signing_remark      AS orderSigningRemark
         FROM rescue_info ri
                  left join rescue_order_info roi on roi.rescue_info_id = ri.id and roi.deleted = '0'
-        where ri.deleted = '0' AND ri.is_revoke = '0' and ri.rescue_status = 2
-        ORDER BY
-            rescue_time DESC;
+        where ri.deleted = '0'
+          AND ri.is_revoke = '0'
+          and ri.rescue_status = 2
+        ORDER BY rescue_time DESC;
     </select>
 
     <select id="selectRescueStatisticsInfoList" parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo"
@@ -1448,7 +1462,8 @@
         order by ri.create_time desc
     </select>
 
-    <select id="selectRescueStatisticsInfoListSecondDispatcher" parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo"
+    <select id="selectRescueStatisticsInfoListSecondDispatcher"
+            parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo"
             resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
         SELECT ri.*,
         roi.order_status,
@@ -1529,7 +1544,8 @@
         order by ri.create_time desc
     </select>
 
-    <select id="getRescueStatisticsInfoNum" resultType="java.util.Map" parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
+    <select id="getRescueStatisticsInfoNum" resultType="java.util.Map"
+            parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
         SELECT
         IFNULL(sum(ri.rescue_status = '3' or ri.rescue_status = '4'), 0) as jyzNum,
         IFNULL(sum(roi.order_status = '1'), 0) as dzfNum,
@@ -1632,7 +1648,8 @@
         </where>
     </select>
 
-    <select id="getRescueStatisticsInfoNumSecondDispatcher" resultType="java.util.Map" parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
+    <select id="getRescueStatisticsInfoNumSecondDispatcher" resultType="java.util.Map"
+            parameterType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
         SELECT
         IFNULL(sum(ri.rescue_status = '3' or ri.rescue_status = '4'), 0) as jyzNum,
         IFNULL(sum(roi.order_status = '1'), 0) as dzfNum,
@@ -1736,7 +1753,6 @@
     </select>
 
 
-
     <select id="driverStatisticsSecond" parameterType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO"
             resultType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO">
         SELECT
@@ -1746,25 +1762,25 @@
             su.nickname AS driver_name,
             COALESCE(COUNT(ri.id), 0) AS rescueNum,
             COALESCE(SUM(
-                             CASE
-                                 WHEN ri.end_scale IS NOT NULL
-                                     AND ri.start_scale IS NOT NULL
-                                     AND ri.end_scale > ri.start_scale
-                                     THEN ri.end_scale - ri.start_scale
-                                 ELSE 0
-                                 END
-                     ), 0) AS mileage,
+            CASE
+            WHEN ri.end_scale IS NOT NULL
+            AND ri.start_scale IS NOT NULL
+            AND ri.end_scale > ri.start_scale
+            THEN ri.end_scale - ri.start_scale
+            ELSE 0
+            END
+            ), 0) AS mileage,
             COALESCE(SUM(roi.set_money), 0) AS money
         FROM driver_info di
-                 INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = 0
-                 LEFT JOIN rescue_info ri ON ri.driver_id = di.id
-            AND ri.deleted = 0 and ri.is_revoke = 0
-            AND ri.driver_name IS NOT NULL
-            AND ri.driver_id IS NOT NULL
-            AND ri.second_dispatch_id = #{vo.secondUserId}
-                 LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
+            INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = 0
+            LEFT JOIN rescue_info ri ON ri.driver_id = di.id
+                AND ri.deleted = 0 and ri.is_revoke = 0
+                AND ri.driver_name IS NOT NULL
+                AND ri.driver_id IS NOT NULL
+                AND ri.second_dispatch_id = #{vo.secondUserId}
+            LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
         WHERE di.deleted = 0
-          AND FIND_IN_SET(#{vo.secondUserId}, di.second_dispatcher_id) > 0
+            AND FIND_IN_SET(#{vo.secondUserId}, di.second_dispatcher_id) > 0
         <if test="vo.startTimeStr!=null and vo.startTimeStr!='' ">
             AND ri.rescue_time &gt;= #{vo.startTimeStr}
         </if>
@@ -1775,37 +1791,37 @@
             AND di.driver_type = #{vo.driverType}
         </if>
         GROUP BY
-            su.id,
-            su.avatar,
-            di.id,
-            su.nickname
+        su.id,
+        su.avatar,
+        di.id,
+        su.nickname
         ORDER BY rescueNum DESC
     </select>
 
     <select id="carStatisticsSecond" parameterType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO"
             resultType="cn.iocoder.yudao.module.rescue.vo.StatisticsStaffVO">
         SELECT
-            rci.rescue_car_num AS driverCarNum,
-            COALESCE(COUNT(ri.id), 0) AS rescueNum,
-            COALESCE(SUM(
-                             CASE
-                                 WHEN ri.end_scale IS NOT NULL
-                                     AND ri.start_scale IS NOT NULL
-                                     AND ri.end_scale > ri.start_scale
-                                     THEN ri.end_scale - ri.start_scale
-                                 ELSE 0
-                                 END
-                     ), 0) AS mileage,
-            COALESCE(SUM(roi.set_money), 0) AS money
+        rci.rescue_car_num AS driverCarNum,
+        COALESCE(COUNT(ri.id), 0) AS rescueNum,
+        COALESCE(SUM(
+        CASE
+        WHEN ri.end_scale IS NOT NULL
+        AND ri.start_scale IS NOT NULL
+        AND ri.end_scale > ri.start_scale
+        THEN ri.end_scale - ri.start_scale
+        ELSE 0
+        END
+        ), 0) AS mileage,
+        COALESCE(SUM(roi.set_money), 0) AS money
         FROM rescue_car_info rci
-                 INNER JOIN rescue_driver_car_relation rdcr ON rci.id = rdcr.car_id AND rdcr.deleted = 0
-                 INNER JOIN driver_info di ON rdcr.driver_id = di.id AND di.deleted = 0
-                 LEFT JOIN rescue_info ri ON ri.driver_car_num = rci.rescue_car_num
-            AND ri.deleted = 0 and ri.is_revoke = 0
-            AND ri.second_dispatch_id = #{vo.secondUserId}
-                 LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
+        INNER JOIN rescue_driver_car_relation rdcr ON rci.id = rdcr.car_id AND rdcr.deleted = 0
+        INNER JOIN driver_info di ON rdcr.driver_id = di.id AND di.deleted = 0
+        LEFT JOIN rescue_info ri ON ri.driver_car_num = rci.rescue_car_num
+        AND ri.deleted = 0 and ri.is_revoke = 0
+        AND ri.second_dispatch_id = #{vo.secondUserId}
+        LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
         WHERE rci.deleted = 0
-          AND FIND_IN_SET(#{vo.secondUserId}, di.second_dispatcher_id) > 0
+        AND FIND_IN_SET(#{vo.secondUserId}, di.second_dispatcher_id) > 0
         <if test="vo.startTimeStr!=null and vo.startTimeStr!='' ">
             AND ri.rescue_time &gt;= #{vo.startTimeStr}
         </if>
@@ -1816,7 +1832,7 @@
             AND rci.rescue_car_own = #{vo.rescueCarOwn}
         </if>
         GROUP BY
-            rci.rescue_car_num
+        rci.rescue_car_num
         ORDER BY rescueNum DESC
     </select>
 
@@ -1836,17 +1852,17 @@
         r.deleted = 0
         AND r.is_revoke = 0
         AND u.id IN (
-            SELECT user_id
-            FROM system_user_role sur
-            WHERE sur.tenant_id = #{vo.tenantId}
-            AND sur.deleted = 0
-                AND sur.role_id = (
-                    SELECT id FROM system_role WHERE `code` = 'second_dispatcher' AND tenant_id = #{vo.tenantId} AND deleted = 0
-                )
-                AND sur.role_id = (
-                    SELECT id FROM system_role WHERE `code` = 'second_dispatcher'
-                    AND tenant_id = #{vo.tenantId} AND deleted = 0
-                )
+        SELECT user_id
+        FROM system_user_role sur
+        WHERE sur.tenant_id = #{vo.tenantId}
+        AND sur.deleted = 0
+        AND sur.role_id = (
+        SELECT id FROM system_role WHERE `code` = 'second_dispatcher' AND tenant_id = #{vo.tenantId} AND deleted = 0
+        )
+        AND sur.role_id = (
+        SELECT id FROM system_role WHERE `code` = 'second_dispatcher'
+        AND tenant_id = #{vo.tenantId} AND deleted = 0
+        )
         )
         <if test="vo.startTimeStr!=null and vo.startTimeStr!='' ">
             AND r.rescue_time &gt;= #{vo.startTimeStr}
@@ -1863,68 +1879,68 @@
     </select>
 
     <!--    <select id="rescueCarList" resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">-->
-<!--        SELECT-->
-<!--            ri.*,-->
-<!--            rci.rescue_car_own AS rescueCarOwn,-->
-<!--            rci.rescue_car_brand AS rescueCarBrand,-->
-<!--            roi.order_status,-->
-<!--            roi.set_money,-->
-<!--            roi.id AS orderId-->
-<!--&#45;&#45;             IFNULL(TIMESTAMPDIFF(YEAR, rci.car_buy_time, CURDATE()), 0)  AS carAge,-->
-<!--&#45;&#45;             COALESCE(SUM(-->
-<!--&#45;&#45;                              CASE-->
-<!--&#45;&#45;                                  WHEN ri.end_scale IS NOT NULL-->
-<!--&#45;&#45;                                      AND ri.start_scale IS NOT NULL-->
-<!--&#45;&#45;                                      AND ri.end_scale > ri.start_scale-->
-<!--&#45;&#45;                                      THEN ri.end_scale - ri.start_scale-->
-<!--&#45;&#45;                                  ELSE 0-->
-<!--&#45;&#45;                                  END-->
-<!--&#45;&#45;                          ), 0) AS mileage-->
-<!--        FROM rescue_car_info rci-->
-<!--                LEFT JOIN rescue_info ri ON rci.rescue_car_num = ri.driver_car_num AND ri.deleted = 0-->
-<!--            LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0-->
-<!--        WHERE-->
-<!--            rci.deleted = 0-->
-<!--        <if test="map.rescueCarOwn != null and map.rescueCarOwn != ''">-->
-<!--            and rci.rescue_car_own = #{map.rescueCarOwn}-->
-<!--        </if>-->
-<!--        <if test="map.orderStatus != null and map.orderStatus != ''">-->
-<!--            and roi.order_status = #{map.orderStatus}-->
-<!--        </if>-->
-<!--        <if test="map.channel != null and map.channel != ''">-->
-<!--            and ri.channel = #{map.channel}-->
-<!--        </if>-->
-<!--        <if test="map.secondDispatchName != null and map.secondDispatchName != ''">-->
-<!--            and ri.second_dispatch_name = #{map.secondDispatchName}-->
-<!--        </if>-->
-<!--        <if test="map.rescueTime != null">-->
-<!--            and ri.rescue_time between-->
-<!--            concat(#{map.rescueTime}, ' 00:00:00') and concat(#{map.rescueTime}, ' 23:59:59')-->
-<!--        </if>-->
-<!--        <if test="map.licenseNum != null">-->
-<!--            and ri.license_num like concat('%', #{map.licenseNum}, '%')-->
-<!--        </if>-->
-<!--        <if test="map.driverName != null">-->
-<!--            and ri.driver_name like concat('%', #{map.driverName}, '%')-->
-<!--        </if>-->
-<!--        <if test="map.driverCarNum != null">-->
-<!--            and ri.driver_car_num like concat('%', #{map.driverCarNum}, '%')-->
-<!--        </if>-->
-<!--        <if test="map.rescueStart != null and map.rescueEnd != null">-->
-<!--            and rescue_time between-->
-<!--            concat(#{map.rescueStart}, ' 00:00:00') and concat(#{map.rescueEnd}, ' 23:59:59')-->
-<!--        </if>-->
-<!--        GROUP BY-->
-<!--            rci.rescue_car_num-->
-<!--        ORDER BY-->
-<!--            ri.create_time DESC-->
-<!--    </select>-->
+    <!--        SELECT-->
+    <!--            ri.*,-->
+    <!--            rci.rescue_car_own AS rescueCarOwn,-->
+    <!--            rci.rescue_car_brand AS rescueCarBrand,-->
+    <!--            roi.order_status,-->
+    <!--            roi.set_money,-->
+    <!--            roi.id AS orderId-->
+    <!--&#45;&#45;             IFNULL(TIMESTAMPDIFF(YEAR, rci.car_buy_time, CURDATE()), 0)  AS carAge,-->
+    <!--&#45;&#45;             COALESCE(SUM(-->
+    <!--&#45;&#45;                              CASE-->
+    <!--&#45;&#45;                                  WHEN ri.end_scale IS NOT NULL-->
+    <!--&#45;&#45;                                      AND ri.start_scale IS NOT NULL-->
+    <!--&#45;&#45;                                      AND ri.end_scale > ri.start_scale-->
+    <!--&#45;&#45;                                      THEN ri.end_scale - ri.start_scale-->
+    <!--&#45;&#45;                                  ELSE 0-->
+    <!--&#45;&#45;                                  END-->
+    <!--&#45;&#45;                          ), 0) AS mileage-->
+    <!--        FROM rescue_car_info rci-->
+    <!--                LEFT JOIN rescue_info ri ON rci.rescue_car_num = ri.driver_car_num AND ri.deleted = 0-->
+    <!--            LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0-->
+    <!--        WHERE-->
+    <!--            rci.deleted = 0-->
+    <!--        <if test="map.rescueCarOwn != null and map.rescueCarOwn != ''">-->
+    <!--            and rci.rescue_car_own = #{map.rescueCarOwn}-->
+    <!--        </if>-->
+    <!--        <if test="map.orderStatus != null and map.orderStatus != ''">-->
+    <!--            and roi.order_status = #{map.orderStatus}-->
+    <!--        </if>-->
+    <!--        <if test="map.channel != null and map.channel != ''">-->
+    <!--            and ri.channel = #{map.channel}-->
+    <!--        </if>-->
+    <!--        <if test="map.secondDispatchName != null and map.secondDispatchName != ''">-->
+    <!--            and ri.second_dispatch_name = #{map.secondDispatchName}-->
+    <!--        </if>-->
+    <!--        <if test="map.rescueTime != null">-->
+    <!--            and ri.rescue_time between-->
+    <!--            concat(#{map.rescueTime}, ' 00:00:00') and concat(#{map.rescueTime}, ' 23:59:59')-->
+    <!--        </if>-->
+    <!--        <if test="map.licenseNum != null">-->
+    <!--            and ri.license_num like concat('%', #{map.licenseNum}, '%')-->
+    <!--        </if>-->
+    <!--        <if test="map.driverName != null">-->
+    <!--            and ri.driver_name like concat('%', #{map.driverName}, '%')-->
+    <!--        </if>-->
+    <!--        <if test="map.driverCarNum != null">-->
+    <!--            and ri.driver_car_num like concat('%', #{map.driverCarNum}, '%')-->
+    <!--        </if>-->
+    <!--        <if test="map.rescueStart != null and map.rescueEnd != null">-->
+    <!--            and rescue_time between-->
+    <!--            concat(#{map.rescueStart}, ' 00:00:00') and concat(#{map.rescueEnd}, ' 23:59:59')-->
+    <!--        </if>-->
+    <!--        GROUP BY-->
+    <!--            rci.rescue_car_num-->
+    <!--        ORDER BY-->
+    <!--            ri.create_time DESC-->
+    <!--    </select>-->
     <select id="rescueCarList" resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
         SELECT
-        rci.rescue_car_own AS rescueCarOwn,              -- 车辆归属
-        rci.rescue_car_brand AS rescueCarBrand,          -- 车辆品牌型号
-        rci.rescue_car_num AS driverCarNum,              -- 车牌号
-        su.nickname AS driverName                        -- 司机姓名（从 system_users 表中获取）
+        rci.rescue_car_own AS rescueCarOwn, -- 车辆归属
+        rci.rescue_car_brand AS rescueCarBrand, -- 车辆品牌型号
+        rci.rescue_car_num AS driverCarNum, -- 车牌号
+        su.nickname AS driverName -- 司机姓名（从 system_users 表中获取）
         FROM rescue_car_info rci
         -- 通过司机与车辆的关联表连接救援车辆与司机信息
         LEFT JOIN rescue_driver_car_relation rdcr ON rci.id = rdcr.car_id
@@ -1932,10 +1948,10 @@
         LEFT JOIN driver_info di ON rdcr.driver_id = di.id
         -- 通过用户ID连接系统用户表，获取司机的用户昵称（即司机的姓名）
         LEFT JOIN system_users su ON di.user_id = su.id
-        WHERE rci.deleted = 0                -- 车辆未删除
-        AND di.deleted = 0                 -- 司机信息未删除
-        AND su.deleted = 0                 -- 用户信息未删除
-        AND rci.tenant_id = 180            -- 根据租户ID进行筛选
+        WHERE rci.deleted = 0 -- 车辆未删除
+        AND di.deleted = 0 -- 司机信息未删除
+        AND su.deleted = 0 -- 用户信息未删除
+        AND rci.tenant_id = 180 -- 根据租户ID进行筛选
         <if test="map.rescueCarOwn != null and map.rescueCarOwn != ''">
             AND rci.rescue_car_own = #{map.rescueCarOwn}
         </if>
@@ -1952,25 +1968,23 @@
 
     </select>
     <select id="selectCarAgeAndMileage" resultType="cn.iocoder.yudao.module.rescue.vo.RescueCarStatRespVO">
-        SELECT
-            rci.rescue_car_num   AS rescueCarNum,
-            IFNULL(TIMESTAMPDIFF(YEAR, rci.car_buy_time, CURDATE()), 0)   AS carAge,
-            COALESCE(SUM(
-                             CASE
-                                 WHEN ri.end_scale   IS NOT NULL
-                                     AND ri.start_scale IS NOT NULL
-                                     AND ri.end_scale >  ri.start_scale
-                                     THEN ri.end_scale - ri.start_scale
-                                 ELSE 0
-                                 END
-                         ), 0)   AS mileage
+        SELECT rci.rescue_car_num                                          AS rescueCarNum,
+               IFNULL(TIMESTAMPDIFF(YEAR, rci.car_buy_time, CURDATE()), 0) AS carAge,
+               COALESCE(SUM(
+                                CASE
+                                    WHEN ri.end_scale IS NOT NULL
+                                        AND ri.start_scale IS NOT NULL
+                                        AND ri.end_scale > ri.start_scale
+                                        THEN ri.end_scale - ri.start_scale
+                                    ELSE 0
+                                    END
+                            ), 0)                                          AS mileage
         FROM rescue_car_info rci
                  LEFT JOIN rescue_info ri
                            ON rci.rescue_car_num = ri.driver_car_num AND ri.deleted = 0
         WHERE rci.deleted = 0
-        GROUP BY
-            rci.rescue_car_num,
-            rci.car_buy_time
+        GROUP BY rci.rescue_car_num,
+                 rci.car_buy_time
         ORDER BY rci.rescue_car_num
     </select>
     <select id="getRescueCarKPI" resultType="cn.iocoder.yudao.module.rescue.domain.RescueInfo">
@@ -1980,17 +1994,17 @@
         DATE(ri.rescue_time) AS rescueTime,
         ri.channel AS channel,
         CASE
-            WHEN ri.end_scale IS NOT NULL
-            AND ri.start_scale IS NOT NULL
-            AND ri.end_scale > ri.start_scale
-            THEN (ri.end_scale - ri.start_scale)
-            ELSE 0
+        WHEN ri.end_scale IS NOT NULL
+        AND ri.start_scale IS NOT NULL
+        AND ri.end_scale > ri.start_scale
+        THEN (ri.end_scale - ri.start_scale)
+        ELSE 0
         END AS mileage,
         roi.order_status AS orderStatus,
         roi.set_money AS setMoney
         FROM rescue_info ri
         LEFT JOIN rescue_order_info roi
-            ON roi.rescue_info_id = ri.id AND roi.deleted = '0'
+        ON roi.rescue_info_id = ri.id AND roi.deleted = '0'
         <where>
             ri.deleted = '0'
             <!-- 按车牌过滤 -->
@@ -2010,4 +2024,293 @@
         </where>
         ORDER BY ri.rescue_time DESC
     </select>
+    <select id="selectDriverReceiptStats" resultType="cn.iocoder.yudao.module.rescue.vo.DriverReceiptStatVO">
+        SELECT
+        di.id AS driverId,
+        ri.driver_name AS driverName,
+        IFNULL(sum(roi.set_money), 0) as yingskNum, -- 应收
+        COUNT(DISTINCT ri.id) AS yingskNumOrderCount, -- 应收单数 = 全部救援
+        IFNULL(sum(CASE WHEN roi.if_confirm_pay = '1' THEN roi.pay_money ELSE 0 END), 0) AS yiskNum, -- 已收
+        SUM(CASE WHEN roi.if_confirm_pay = '1' THEN 1 ELSE 0 END) AS yiskNumOrderCount, -- 已收单数
+        IFNULL(sum(CASE WHEN roi.if_confirm_pay = '0' THEN roi.set_money ELSE 0 END), 0) AS dskNum, -- 待收
+        SUM(CASE WHEN roi.if_confirm_pay = '0' THEN 1 ELSE 0 END) AS dskNumOrderCount -- 待收单数
+
+/*        FROM driver_info di
+        INNER JOIN system_users su ON di.user_id = su.id AND su.deleted = 0
+        LEFT JOIN rescue_info ri ON di.id = ri.driver_id AND ri.deleted = 0 and ri.is_revoke = 0
+        LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
+
+        where
+        ri.deleted = 0
+        AND ri.is_revoke = 0
+        AND ri.driver_id IS NOT NULL
+        AND ri.driver_name IS NOT NULL*/
+
+        FROM rescue_info ri
+            LEFT JOIN rescue_order_info roi   ON roi.rescue_info_id = ri.id  AND roi.deleted = 0
+            LEFT JOIN driver_info di     ON di.id = ri.driver_id
+            LEFT JOIN system_users su    ON di.user_id = su.id
+        WHERE
+            ri.is_revoke = 0 AND ri.deleted = 0
+        <if test="startTimeStr != null and startTimeStr != ''">
+            AND ri.rescue_time &gt;= #{startTimeStr}
+        </if>
+        <if test="endTimeStr != null and endTimeStr != ''">
+            AND ri.rescue_time &lt;= #{endTimeStr}
+        </if>
+        <if test="driverType != null and driverType != ''">
+            AND di.driver_type &lt;= #{driverType}
+        </if>
+
+        GROUP BY di.id, ri.driver_name
+        ORDER BY dskNum DESC
+    </select>
+    <select id="selectChannelReceiptStats" resultType="cn.iocoder.yudao.module.rescue.vo.ChannelReceiptStatVO">
+        SELECT
+        COALESCE(NULLIF(TRIM(ri.channel), ''), '未知渠道') AS channel,
+        COUNT(DISTINCT ri.id) AS orderCount,
+        IFNULL(sum(roi.set_money), 0) as yingskNum, -- 应收
+        COUNT(DISTINCT ri.id) AS yingskNumOrderCount, -- 应收单数 = 全部救援
+        IFNULL(sum(CASE WHEN roi.if_confirm_pay = '1' THEN roi.pay_money ELSE 0 END), 0) AS yiskNum, -- 已收
+        SUM(CASE WHEN roi.if_confirm_pay = '1' THEN 1 ELSE 0 END) AS yiskNumOrderCount, -- 已收单数
+        IFNULL(sum(CASE WHEN roi.if_confirm_pay = '0' THEN roi.set_money ELSE 0 END), 0) AS dskNum, -- 待收
+        SUM(CASE WHEN roi.if_confirm_pay = '0' THEN 1 ELSE 0 END) AS dskNumOrderCount -- 待收单数
+
+        FROM rescue_info ri
+        LEFT JOIN rescue_order_info roi
+        ON roi.rescue_info_id = ri.id AND roi.deleted = 0
+        WHERE
+        ri.deleted = 0 AND ri.is_revoke = 0
+        AND ri.driver_name = #{driverName}
+        <if test="startTimeStr != null and startTimeStr != ''">
+            AND ri.rescue_time &gt;= #{startTimeStr}
+        </if>
+        <if test="endTimeStr != null and endTimeStr != ''">
+            AND ri.rescue_time &lt;= #{endTimeStr}
+        </if>
+        GROUP BY COALESCE(NULLIF(TRIM(ri.channel), ''), '未知渠道')
+    </select>
+    <select id="moneySummary" resultType="cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryVO">
+        SELECT
+            ri.driver_name AS driverName,
+            COUNT(ri.id) AS rescueNum,
+            IFNULL( sum( roi.set_money ), 0 ) AS yingskNum,-- 应收
+            COUNT( DISTINCT ri.id ) AS yingskNumOrderCount,-- 应收单数 = 全部救援
+            IFNULL( sum( CASE WHEN roi.if_confirm_pay = '1' THEN roi.pay_money ELSE 0 END ), 0 ) AS yiskNum,-- 已收
+            SUM( CASE WHEN roi.if_confirm_pay = '1' THEN 1 ELSE 0 END ) AS yiskNumOrderCount,-- 已收单数
+            IFNULL( sum( CASE WHEN roi.if_confirm_pay = '0' THEN roi.set_money ELSE 0 END ), 0 ) AS dskNum,-- 待收
+            SUM( CASE WHEN roi.if_confirm_pay = '0' THEN 1 ELSE 0 END ) AS dskNumOrderCount, -- 待收单数
+            IFNULL(sum(ri.rescue_status = '6'), 0) as dqcNum -- 待取车数
+
+        FROM rescue_info ri
+            LEFT JOIN rescue_order_info roi   ON roi.rescue_info_id = ri.id  AND roi.deleted = 0
+            LEFT JOIN driver_info di     ON di.id = ri.driver_id
+            LEFT JOIN system_users su    ON di.user_id = su.id
+        WHERE
+            ri.is_revoke = 0 AND ri.deleted = 0
+        <if test="channel != null and channel != '' ">
+            AND ri.channel = #{channel}
+        </if>
+        <if test="source != null and source != '' ">
+            AND ri.source = #{source}
+        </if>
+        <if test="startTimeStr != null and startTimeStr != '' ">
+            AND ri.rescue_time &gt;= #{startTimeStr}
+        </if>
+        <if test="endTimeStr != null and endTimeStr != '' ">
+            AND ri.rescue_time &lt;= #{endTimeStr}
+        </if>
+        <if test="driverName != null and driverName != '' ">
+            AND ri.driver_name = #{driverName}
+        </if>
+        <if test="secondDispatchName != null and secondDispatchName != '' ">
+            AND ri.second_dispatch_name = #{secondDispatchName}
+        </if>
+        <if test="driverCarNum != null and driverCarNum != '' ">
+            AND ri.driver_car_num = #{driverCarNum}
+        </if>
+        <if test="toScene != null and toScene != '' ">
+            AND ri.is_dispatched_to_scene = #{toScene}
+        </if>
+        <if test="toRepair != null and toRepair != '' ">
+            AND ri.is_wei_xiu = #{toRepair}
+        </if>
+        <if test="faultType!=null and faultType!='' ">
+            AND ri.fault_type = #{faultType}
+        </if>
+        <if test="rescuePosition!=null and rescuePosition!='' ">
+            AND ri.rescue_position like concat('%', #{rescuePosition}, '%')
+        </if>
+        <if test="carBrand!=null and carBrand!='' ">
+            AND ri.car_brand = #{carBrand}
+        </if>
+        <if test="carType!=null and carType!='' ">
+            AND ri.car_type = #{carType}
+        </if>
+        <if test="estimateDownCar!=null and estimateDownCar!='' ">
+            AND ri.estimate_down_car = #{estimateDownCar}
+        </if>
+        <if test="ifNewEnergy!=null and ifNewEnergy!='' ">
+            AND ri.if_new_energy = #{ifNewEnergy}
+        </if>
+        <if test="rescueType!=null and rescueType!='' ">
+            AND ri.rescue_type = #{rescueType}
+        </if>
+        <if test="feeType!=null and feeType!='' ">
+            AND ri.fee_type = #{feeType}
+        </if>
+        <if test="isKouChe!=null and isKouChe!='' ">
+            AND ri.is_kou_che = #{isKouChe}
+        </if>
+        <if test="transferReason != null and transferReason != '' ">
+            AND EXISTS (
+            SELECT 1
+            FROM rescue_info_detail rd
+            WHERE rd.rescue_info_id = ri.id AND rd.deleted = '0'
+            AND rd.title = '车辆移交'
+            AND rd.auto_remark LIKE '%移交事由:%'
+            AND TRIM(SUBSTRING_INDEX(SUBSTRING_INDEX(
+            rd.auto_remark, '移交事由:', -1), ',', 1))
+            = #{transferReason}
+            )
+        </if>
+        <choose>
+            <when test="rescueStatus == '0'.toString()">
+                <!-- 已接单 -->
+            </when>
+            <when test="rescueStatus == '1'.toString()">
+                <!-- 救援中 -->
+                and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3' or
+                ri.rescue_status = '4')
+            </when>
+            <when test="rescueStatus == '3'.toString()">
+                <!-- 待取车 -->
+                and ri.rescue_status = '6'
+            </when>
+            <when test="rescueStatus == '5'.toString()">
+                <!--  已完成 -->
+                and (ri.rescue_status = '5' or ri.rescue_status = '8' or roi.order_status = '3')
+            </when>
+            <!-- rescueStatus = 10 → 已收款 -->
+            <when test="rescueStatus == '10'">
+                AND roi.if_confirm_pay = '1'
+            </when>
+            <!-- rescueStatus = 11 → 待收款 -->
+            <when test="rescueStatus == '11'">
+                AND roi.if_confirm_pay = '0'
+            </when>
+            <!-- rescueStatus 为空或其它值 → 不加任何收款状态过滤 -->
+            <otherwise></otherwise>
+        </choose>
+
+        GROUP BY ri.driver_name
+        ORDER BY rescueNum DESC;
+    </select>
+    <select id="moneySummaryDetail" resultType="cn.iocoder.yudao.module.rescue.vo.money.DriverSummaryDetailVO">
+        SELECT
+            ri.driver_name as driverName,
+            ri.license_num as licenseNum,
+            ri.rescue_time as rescueTime,
+            roi.set_money as setMoney,
+            ri.channel
+        FROM
+            rescue_info ri
+            LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
+        WHERE
+        ri.deleted = 0 AND ri.is_revoke = 0
+        <if test="channel != null and channel != '' ">
+            AND ri.channel = #{channel}
+        </if>
+        <if test="source != null and source != '' ">
+            AND ri.source = #{source}
+        </if>
+        <if test="startTimeStr != null and startTimeStr != '' ">
+            AND ri.rescue_time &gt;= #{startTimeStr}
+        </if>
+        <if test="endTimeStr != null and endTimeStr != '' ">
+            AND ri.rescue_time &lt;= #{endTimeStr}
+        </if>
+        <if test="driverName != null and driverName != '' ">
+            AND ri.driver_name = #{driverName}
+        </if>
+        <if test="driverCarNum != null and driverCarNum != '' ">
+            AND ri.driver_car_num = #{driverCarNum}
+        </if>
+        <if test="secondDispatchName != null and secondDispatchName != '' ">
+            AND ri.second_dispatch_name = #{secondDispatchName}
+        </if>
+        <if test="toScene != null and toScene != '' ">
+            AND ri.is_dispatched_to_scene = #{toScene}
+        </if>
+        <if test="toRepair != null and toRepair != '' ">
+            AND ri.is_wei_xiu = #{toRepair}
+        </if>
+        <if test="faultType!=null and faultType!='' ">
+            AND ri.fault_type = #{faultType}
+        </if>
+        <if test="rescuePosition!=null and rescuePosition!='' ">
+            AND ri.rescue_position like concat('%', #{rescuePosition}, '%')
+        </if>
+        <if test="carBrand!=null and carBrand!='' ">
+            AND ri.car_brand = #{carBrand}
+        </if>
+        <if test="carType!=null and carType!='' ">
+            AND ri.car_type = #{carType}
+        </if>
+        <if test="estimateDownCar!=null and estimateDownCar!='' ">
+            AND ri.estimate_down_car = #{estimateDownCar}
+        </if>
+        <if test="ifNewEnergy!=null and ifNewEnergy!='' ">
+            AND ri.if_new_energy = #{ifNewEnergy}
+        </if>
+        <if test="rescueType!=null and rescueType!='' ">
+            AND ri.rescue_type = #{rescueType}
+        </if>
+        <if test="feeType!=null and feeType!='' ">
+            AND ri.fee_type = #{feeType}
+        </if>
+        <if test="isKouChe!=null and isKouChe!='' ">
+            AND ri.is_kou_che = #{isKouChe}
+        </if>
+        <if test="transferReason != null and transferReason != '' ">
+            AND EXISTS (
+            SELECT 1
+            FROM rescue_info_detail rd
+            WHERE rd.rescue_info_id = ri.id AND rd.deleted = '0'
+            AND rd.title = '车辆移交'
+            AND rd.auto_remark LIKE '%移交事由:%'
+            AND TRIM(SUBSTRING_INDEX(SUBSTRING_INDEX(
+            rd.auto_remark, '移交事由:', -1), ',', 1))
+            = #{transferReason}
+            )
+        </if>
+        <choose>
+            <when test="rescueStatus == '1'.toString()">
+                <!-- 救援中 -->
+                and (ri.rescue_status = '1' or ri.rescue_status = '2' or ri.rescue_status = '3' or
+                ri.rescue_status = '4')
+            </when>
+            <when test="rescueStatus == '3'.toString()">
+                <!-- 待取车 -->
+                and ri.rescue_status = '6'
+            </when>
+            <when test="rescueStatus == '5'.toString()">
+                <!--  已完成 -->
+                and (ri.rescue_status = '5' or ri.rescue_status = '8' or roi.order_status = '3')
+            </when>
+            <!-- rescueStatus = 10 → 已收款 -->
+            <when test="rescueStatus == '10'">
+                AND roi.if_confirm_pay = '1'
+            </when>
+            <!-- rescueStatus = 11 → 待收款 -->
+            <when test="rescueStatus == '11'">
+                AND roi.if_confirm_pay = '0'
+            </when>
+            <!-- rescueStatus 为空或其它值 → 不加任何收款状态过滤 -->
+            <otherwise></otherwise>
+        </choose>
+
+        ORDER BY
+        ri.create_time DESC
+    </select>
 </mapper>