From fb1fc179eed0e5cd9fd89fe972378a8c8609b3c0 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 四月 2026 09:52:32 +0800
Subject: [PATCH] fix: 正式库端口修改

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 7fe1f4f..ebda2fc 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -66,11 +66,14 @@
         pm.unit,
         p.product_name
         from stock_inventory si
-        left join product_model pm on si.product_model_id = pm.id
+        left join product_model pm on si. = pm.id
         left join product p on pm.product_id = p.id
         where 1 = 1
         <if test="ew.productName != null and ew.productName !=''">
             and p.product_name like concat('%',#{ew.productName},'%')
+        </if>
+        <if test="ew.productModelId != null">
+            and si.product_model_id = #{ew.productModelId}
         </if>
     </select>
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -199,14 +202,16 @@
     </select>
 
     <select id="selectStorageProductCountByDate" resultType="int">
-        SELECT COUNT(*)
-        FROM (SELECT create_time
+        SELECT SUM(total_count)
+        FROM (SELECT COUNT(*) as total_count
               FROM stock_inventory
+              WHERE create_time &gt;= #{startDate}
+                AND create_time &lt;= #{endDate}
               UNION ALL
-              SELECT create_time
-              FROM stock_uninventory) combined
-        WHERE create_time &gt;= #{startDate}
-          AND create_time &lt;= #{endDate}
+              SELECT COUNT(*) as total_count
+              FROM stock_uninventory
+              WHERE create_time &gt;= #{startDate}
+                AND create_time &lt;= #{endDate}) AS combined_counts
     </select>
 
     <select id="selectDailyStockInCounts" resultType="java.util.Map">

--
Gitblit v1.9.3