From 23f81a391100b9f570194650bb537fd877a86a15 Mon Sep 17 00:00:00 2001
From: xuyuncong <3422692813@qq.com>
Date: Mon, 3 Nov 2025 10:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E8=AE=A1=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/RepairStatisticsController.java     | 14 ++++++-
 .../base/mapper/RepairStatisticsMapper.java   |  9 ++++
 .../base/service/RepairStatisticsService.java |  9 ++++
 .../impl/RepairStatisticsServiceImpl.java     | 12 ++++++
 .../impl/DlRepairTicketsServiceImpl.java      |  3 ++
 .../mapper/base/RepairStatisticsMapper.xml    | 42 +++++++++++++++++++
 .../mapper/tickets/DlRepairTicketsMapper.xml  |  3 +-
 7 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java
index 180ab7f6..dfcbfa22 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java
@@ -290,7 +290,7 @@ public class RepairStatisticsController {
     public CommonResult<?> procurementOrPickingStatistics(QueryBusinessReqVO reqVO) {
         return CommonResult.success(statisticsService.procurementOrPickingStatistics(reqVO));
     }
-    
+
     /**
      * @description :整车配件完成率统计
      * @author AI
@@ -303,4 +303,16 @@ public class RepairStatisticsController {
         return CommonResult.success(statisticsService.vehiclesAccessoriesCompletionRate(reqVO));
     }
 
+    /**
+     * @description :配件列表申请统计
+     * @author xyc
+     * @date 10:46 2025/10/31
+     * @param reqVO {@link QueryBusinessReqVO}
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
+     **/
+    @GetMapping("/accessoriesRequestListStatistics")
+    public CommonResult<?> accessoriesRequestListStatistics(QueryBusinessReqVO reqVO) {
+        return CommonResult.success(statisticsService.accessoriesRequestListStatistics(reqVO));
+    }
+
 }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java
index 098edade..e9016ce5 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java
@@ -206,4 +206,13 @@ public interface RepairStatisticsMapper {
      * @return java.util.Map<java.lang.String, java.lang.Object>
      **/
     List<Map<String, Object>> vehiclesAccessoriesCompletionRate(QueryBusinessReqVO reqVO);
+
+    /**
+     * @description // TODO: 配件详情统计
+     * @author lf
+     * @date 10:57 2025/10/31
+     * @param reqVO
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     **/
+    List<Map<String, Object>> accessoriesRequestListStatistics(QueryBusinessReqVO reqVO);
 }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java
index eb26d596..6da87de1 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java
@@ -199,4 +199,13 @@ public interface RepairStatisticsService {
      * @return java.util.Map<java.lang.String, java.lang.Object>
      **/
     List<Map<String, Object>> vehiclesAccessoriesCompletionRate(QueryBusinessReqVO reqVO);
+
+    /**
+     * @description // TODO: 配件详情统计
+     * @author lf
+     * @date 10:56 2025/10/31
+     * @param reqVO
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     **/
+    List<Map<String, Object>> accessoriesRequestListStatistics(QueryBusinessReqVO reqVO);
 }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java
index b17227b9..14de50e3 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java
@@ -369,4 +369,16 @@ public class RepairStatisticsServiceImpl implements RepairStatisticsService {
     public List<Map<String, Object>> vehiclesAccessoriesCompletionRate(QueryBusinessReqVO reqVO) {
         return statisticsMapper.vehiclesAccessoriesCompletionRate(reqVO);
     }
+
+    /**
+     * @param reqVO
+     * @return java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
+     * @description // TODO: 配件详情统计
+     * @author lf
+     * @date 10:56 2025/10/31
+     **/
+    @Override
+    public List<Map<String, Object>> accessoriesRequestListStatistics(QueryBusinessReqVO reqVO) {
+        return statisticsMapper.accessoriesRequestListStatistics(reqVO);
+    }
 }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index efd1b9d4..2382efda 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -936,6 +936,8 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         // 构建查询条件
         QueryWrapper<DlRepairTickets> queryWrapper = new QueryWrapper<>();
 
+        queryWrapper.ne("tickets_status", "03");
+
         if (startDate != null && endDate != null) {
             // 如果有时间范围，添加时间条件
             queryWrapper.between("create_time",
@@ -1058,6 +1060,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         // 直接使用 mapper 查询已交车工单并按 repairType 分组
         QueryWrapper<DlRepairTickets> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_handover", "1"); // 已交车
+        queryWrapper.ne("tickets_status", "03");
 
         if (startDate != null && endDate != null) {
             queryWrapper.between("create_time",
diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml
index 1dba080e..ee0b9ff6 100644
--- a/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/base/RepairStatisticsMapper.xml
@@ -504,4 +504,46 @@
             AND so.so_time BETWEEN #{dateRange[0]} AND #{dateRange[1]}      -- 自定义时间段
         </if>
     </select>
+    <select id="accessoriesRequestListStatistics" resultType="java.util.Map">
+        SELECT
+        drt.id AS ticketId,
+        drt.ticket_no AS ticketNo, <!-- 工单号 -->
+        drt.car_no AS carNo, <!-- 车牌号 -->
+        drt.car_vin AS carVin, <!-- 车架号 -->
+        drt.user_name AS userName, <!-- 客户姓名 -->
+        COUNT(DISTINCT dtw.id) AS partsApplyCount, <!-- 配件申请次数 -->
+        GROUP_CONCAT(DISTINCT DATE_FORMAT(dtw.create_time, '%Y-%m-%d %H:%i:%s') SEPARATOR '; ') AS applyTimeList, <!-- 申请时间列表 -->
+        SUM(dti.wares_count) AS totalApplyQuantity, <!-- 申请配件总数量 -->
+        SUM(COALESCE(dti.wares_already_count, 0)) AS receivedQuantity, <!-- 已领取配件数量 -->
+        GROUP_CONCAT(DISTINCT
+        CASE
+        WHEN drso.so_type = '02' THEN DATE_FORMAT(drso.so_time, '%Y-%m-%d %H:%i:%s')
+        ELSE NULL
+        END
+        SEPARATOR '; '
+        ) AS receiveTimeList, <!-- 领料时间列表 -->
+        drt.now_repair_name AS currentRepairer, <!-- 当前施工人 -->
+        drt.adviser_name AS serviceAdviser <!-- 服务顾问 -->
+        FROM
+        dl_repair_tickets drt
+        LEFT JOIN
+        dl_ticket_wares dtw ON drt.id = dtw.ticket_id AND dtw.deleted = 0
+        LEFT JOIN
+        dl_tw_item dti ON dtw.id = dti.tw_id AND dti.deleted = 0
+        LEFT JOIN
+        dl_repair_so drso ON dtw.id = drso.tw_id AND drso.so_type = '02' AND drso.deleted = 0
+        WHERE
+        drt.deleted = 0
+        <!-- AND drt.ticket_no = '具体的工单号' 按具体工单查询 -->
+        <!-- AND drt.car_no = '具体的车牌号' 或者按车牌号查询 -->
+        <if test="dateRange != null and dateRange.size() == 2">
+            AND dtw.create_time BETWEEN #{dateRange[0]} AND #{dateRange[1]}
+        </if>
+        <!-- AND dtw.create_time BETWEEN '开始时间' AND '结束时间' 按时间筛选 -->
+        GROUP BY
+        drt.id, drt.ticket_no, drt.car_no, drt.car_vin, drt.user_name,
+        drt.now_repair_name, drt.adviser_name
+        ORDER BY
+        drt.create_time DESC;
+    </select>
 </mapper>
diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
index e71b3bb8..5ff5a2a1 100644
--- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
@@ -206,12 +206,13 @@
         </if>
 
         FROM dl_repair_tickets drt
-        LEFT JOIN repair_order_info rorder ON rorder.goods_id = drt.id
+        INNER JOIN repair_order_info rorder ON rorder.goods_id = drt.id
         <if test="(map.payStatus != null and map.payStatus != '' and (map.payStatus == '01' or map.payStatus == '04')) or (map.payStatuses != null and map.payStatuses.size() > 0 and (map.payStatuses.indexOf('01') >= 0 or map.payStatuses.indexOf('04') >= 0))">
             LEFT JOIN dl_repair_records drr ON drt.id = drr.ticket_id AND drr.type = 'jssq'
         </if>
         <where>
             drt.deleted = '0'
+            AND rorder.deleted = '0'
 
             <!-- 已结算的 -->
             <if test="map.ticketsStatus != null and map.ticketsStatus != '' and map.ticketsStatus == '02'">