From 911dcb9684f2be6546585815ac0a30d1452077ca Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 29 Dec 2025 13:04:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(report):=20=E4=BC=98=E5=8C=96=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E6=8A=A5=E8=A1=A8=E6=9F=A5=E8=AF=A2SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复销售员统计数据中子查询的条件引用问题
- 统一SQL查询格式化，提升代码可读性
- 优化销售员占比计算的子查询结构
- 添加完整的查询条件到销售员统计子查询中
- 保持所有现有功能逻辑不变
---
 .../mapper/klp/CrmSalesReportMapper.xml       | 125 ++++++++++++++----
 1 file changed, 100 insertions(+), 25 deletions(-)

diff --git a/klp-crm/src/main/resources/mapper/klp/CrmSalesReportMapper.xml b/klp-crm/src/main/resources/mapper/klp/CrmSalesReportMapper.xml
index aeeaff3b..625ee60f 100644
--- a/klp-crm/src/main/resources/mapper/klp/CrmSalesReportMapper.xml
+++ b/klp-crm/src/main/resources/mapper/klp/CrmSalesReportMapper.xml
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="bo.includeObjectionOrders != null and bo.includeObjectionOrders == false">
                 AND NOT EXISTS (
-                    SELECT 1 FROM crm_sales_objection obj 
+                    SELECT 1 FROM crm_sales_objection obj
                     WHERE obj.order_id = o.order_id AND obj.del_flag = 0
                 )
             </if>
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 查询销售汇总统计数据 -->
     <select id="selectSalesSummary" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$SalesSummary">
-        SELECT 
+        SELECT
             COUNT(o.order_id) as totalOrderCount,
             COALESCE(SUM(o.order_amount), 0) as totalSalesAmount,
             COUNT(CASE WHEN o.order_status = 3 THEN 1 END) as completedOrderCount,
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 查询订单明细列表 -->
     <select id="selectOrderDetailList" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$OrderDetail">
-        SELECT 
+        SELECT
             o.order_id,
             o.order_code,
             c.customer_code,
@@ -116,19 +116,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM crm_order o
         LEFT JOIN crm_customer c ON o.customer_id = c.customer_id
         LEFT JOIN (
-            SELECT 
-                order_id, 
+            SELECT
+                order_id,
                 COUNT(*) as item_count
-            FROM crm_order_item 
-            WHERE del_flag = 0 
+            FROM crm_order_item
+            WHERE del_flag = 0
             GROUP BY order_id
         ) item_stats ON o.order_id = item_stats.order_id
         LEFT JOIN (
-            SELECT 
-                order_id, 
+            SELECT
+                order_id,
                 COUNT(*) as objection_count
-            FROM crm_sales_objection 
-            WHERE del_flag = 0 
+            FROM crm_sales_objection
+            WHERE del_flag = 0
             GROUP BY order_id
         ) obj_stats ON o.order_id = obj_stats.order_id
         <include refid="selectCondition"/>
@@ -147,17 +147,92 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 查询销售员统计数据 -->
     <select id="selectSalesmanStats" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$SalesmanStat">
-        SELECT 
-            o.salesman,
-            COUNT(o.order_id) as orderCount,
-            COALESCE(SUM(o.order_amount), 0) as salesAmount,
-            ROUND(
-                COALESCE(SUM(o.order_amount), 0) * 100.0 / 
-                NULLIF((SELECT SUM(order_amount) FROM crm_order o2 
-                        LEFT JOIN crm_customer c2 ON o2.customer_id = c2.customer_id
-                        <include refid="selectCondition"/>), 0), 
-                2
-            ) as percentage
+        SELECT
+        o.salesman,
+        COUNT(o.order_id) as orderCount,
+        COALESCE(SUM(o.order_amount), 0) as salesAmount,
+        ROUND(
+        COALESCE(SUM(o.order_amount), 0) * 100.0 /
+        NULLIF((
+        SELECT SUM(o2.order_amount)
+        FROM crm_order o2
+        LEFT JOIN crm_customer c2 ON o2.customer_id = c2.customer_id
+        <!-- 子查询使用独立的条件片段，避免引用外层o/c -->
+        <where>
+            o2.del_flag = 0 AND c2.del_flag = 0
+            <if test="bo.startTime != null">
+                AND DATE(o2.create_time) &gt;= #{bo.startTime}
+            </if>
+            <if test="bo.endTime != null">
+                AND DATE(o2.create_time) &lt;= #{bo.endTime}
+            </if>
+            <if test="bo.salesmanList != null and bo.salesmanList.size() > 0">
+                AND o2.salesman IN
+                <foreach collection="bo.salesmanList" item="salesman" open="(" separator="," close=")">
+                    #{salesman}
+                </foreach>
+            </if>
+            <if test="bo.customerIdList != null and bo.customerIdList.size() > 0">
+                AND o2.customer_id IN
+                <foreach collection="bo.customerIdList" item="customerId" open="(" separator="," close=")">
+                    #{customerId}
+                </foreach>
+            </if>
+            <if test="bo.customerLevelList != null and bo.customerLevelList.size() > 0">
+                AND c2.customer_level IN
+                <foreach collection="bo.customerLevelList" item="level" open="(" separator="," close=")">
+                    #{level}
+                </foreach>
+            </if>
+            <if test="bo.industryList != null and bo.industryList.size() > 0">
+                AND c2.industry IN
+                <foreach collection="bo.industryList" item="industry" open="(" separator="," close=")">
+                    #{industry}
+                </foreach>
+            </if>
+            <if test="bo.orderStatusList != null and bo.orderStatusList.size() > 0">
+                AND o2.order_status IN
+                <foreach collection="bo.orderStatusList" item="status" open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            </if>
+            <if test="bo.financeStatusList != null and bo.financeStatusList.size() > 0">
+                AND o2.finance_status IN
+                <foreach collection="bo.financeStatusList" item="status" open="(" separator="," close=")">
+                    #{status}
+                </foreach>
+            </if>
+            <if test="bo.orderTypeList != null and bo.orderTypeList.size() > 0">
+                AND o2.order_type IN
+                <foreach collection="bo.orderTypeList" item="type" open="(" separator="," close=")">
+                    #{type}
+                </foreach>
+            </if>
+            <if test="bo.minOrderAmount != null">
+                AND o2.order_amount &gt;= #{bo.minOrderAmount}
+            </if>
+            <if test="bo.maxOrderAmount != null">
+                AND o2.order_amount &lt;= #{bo.maxOrderAmount}
+            </if>
+            <if test="bo.onlyUnpaidOrders != null and bo.onlyUnpaidOrders == true">
+                AND o2.unpaid_amount > 0
+            </if>
+            <if test="bo.companyNameKeyword != null and bo.companyNameKeyword != ''">
+                AND c2.company_name LIKE CONCAT('%', #{bo.companyNameKeyword}, '%')
+            </if>
+            <if test="bo.orderCodeKeyword != null and bo.orderCodeKeyword != ''">
+                AND o2.order_code LIKE CONCAT('%', #{bo.orderCodeKeyword}, '%')
+            </if>
+            <if test="bo.includeObjectionOrders != null and bo.includeObjectionOrders == false">
+                AND NOT EXISTS (
+                SELECT 1 FROM crm_sales_objection obj
+                WHERE obj.order_id = o2.order_id AND obj.del_flag = 0
+                )
+            </if>
+        </where>
+        ), 0),
+        2
+        ) as percentage
         FROM crm_order o
         LEFT JOIN crm_customer c ON o.customer_id = c.customer_id
         <include refid="selectCondition"/>
@@ -167,7 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 查询客户等级统计数据 -->
     <select id="selectCustomerLevelStats" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$CustomerLevelStat">
-        SELECT 
+        SELECT
             c.customer_level,
             COUNT(DISTINCT c.customer_id) as customerCount,
             COUNT(o.order_id) as orderCount,
@@ -181,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 查询行业统计数据 -->
     <select id="selectIndustryStats" resultType="com.klp.crm.domain.vo.CrmSalesReportVo$IndustryStat">
-        SELECT 
+        SELECT
             COALESCE(c.industry, '未分类') as industry,
             COUNT(DISTINCT c.customer_id) as customerCount,
             COUNT(o.order_id) as orderCount,
@@ -193,4 +268,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY salesAmount DESC
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>