From d90a45a49ddb0ae512ef97b5e6fc981caab5e158 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 15 九月 2026 15:49:26 +0800
Subject: [PATCH] refactor(home): 优化产品进出库分析功能的数据库查询逻辑

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 517a17d..dc519a6 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -265,27 +265,65 @@
     </select>
 
     <select id="selectDailyStockInCounts" resultType="java.util.Map">
+        WITH RECURSIVE get_root AS (SELECT id,
+                                           parent_id,
+                                           id AS root_id
+                                    FROM product
+                                    WHERE parent_id IS NULL
+                                    UNION ALL
+                                    SELECT p.id,
+                                           p.parent_id,
+                                           gr.root_id
+                                    FROM product p
+                                             INNER JOIN get_root gr ON p.parent_id = gr.id)
         SELECT DATE(sir.create_time) AS date,
                SUM(sir.stock_in_num) AS count
         FROM stock_in_record sir
                  JOIN product_model pm ON sir.product_model_id = pm.id
                  JOIN product p ON pm.product_id = p.id
-        WHERE (p.parent_id = #{rootCategoryId} OR p.id = #{rootCategoryId})
-          AND sir.create_time &gt;= #{startDate}
-          AND sir.create_time &lt;= #{endDate}
+                 JOIN get_root gr ON gr.id = p.id
+                 JOIN product rp ON rp.id = gr.root_id
+        WHERE
+        <choose>
+            <when test="productScope == '鎴愬搧'">rp.product_type = '鎴愬搧'</when>
+            <when test="productScope == '鍗婃垚鍝�'">rp.product_type = '鍗婃垚鍝�'</when>
+            <otherwise>(rp.product_type IS NULL
+                OR (rp.product_type != '鎴愬搧' AND rp.product_type != '鍗婃垚鍝�'))</otherwise>
+        </choose>
+        AND sir.create_time &gt;= #{startDate}
+        AND sir.create_time &lt;= #{endDate}
         GROUP BY DATE(sir.create_time)
         ORDER BY DATE(sir.create_time) ASC
     </select>
 
     <select id="selectDailyStockOutCounts" resultType="java.util.Map">
+        WITH RECURSIVE get_root AS (SELECT id,
+                                           parent_id,
+                                           id AS root_id
+                                    FROM product
+                                    WHERE parent_id IS NULL
+                                    UNION ALL
+                                    SELECT p.id,
+                                           p.parent_id,
+                                           gr.root_id
+                                    FROM product p
+                                             INNER JOIN get_root gr ON p.parent_id = gr.id)
         SELECT DATE(sor.create_time)  AS date,
                SUM(sor.stock_out_num) AS count
         FROM stock_out_record sor
                  JOIN product_model pm ON sor.product_model_id = pm.id
                  JOIN product p ON pm.product_id = p.id
-        WHERE (p.parent_id = #{rootCategoryId} OR p.id = #{rootCategoryId})
-          AND sor.create_time &gt;= #{startDate}
-          AND sor.create_time &lt;= #{endDate}
+                 JOIN get_root gr ON gr.id = p.id
+                 JOIN product rp ON rp.id = gr.root_id
+        WHERE
+        <choose>
+            <when test="productScope == '鎴愬搧'">rp.product_type = '鎴愬搧'</when>
+            <when test="productScope == '鍗婃垚鍝�'">rp.product_type = '鍗婃垚鍝�'</when>
+            <otherwise>(rp.product_type IS NULL
+                OR (rp.product_type != '鎴愬搧' AND rp.product_type != '鍗婃垚鍝�'))</otherwise>
+        </choose>
+        AND sor.create_time &gt;= #{startDate}
+        AND sor.create_time &lt;= #{endDate}
         GROUP BY DATE(sor.create_time)
         ORDER BY DATE(sor.create_time) ASC
     </select>

--
Gitblit v1.9.3