From 79f2ade5f58cf1bfc5118bf0720f8aba426c7840 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 11 六月 2026 21:31:06 +0800
Subject: [PATCH] fix: 修复生产驾驶舱工单执行效率分析、生产核算分析、投入产出分析数据不显示问题

---
 src/main/resources/mapper/production/ProductionProductInputMapper.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index 506ec70..f04a824 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -24,7 +24,7 @@
                  left join production_product_main ppm on ppi.production_product_main_id = ppm.id
                  left join production_operation_task pot on ppm.production_operation_task_id = pot.id
                  left join production_order po on pot.production_order_id = po.id
-                 left join product_model pm on po.product_model_id = pm.id
+                 left join product_model pm on ppi.product_model_id = pm.id
                  left join product p on pm.product_id = p.id
         <where>
             <if test="c.productNo != null and c.productNo != ''">
@@ -36,8 +36,21 @@
             <if test="c.productName != null and c.productName != ''">
                 and p.product_name like concat('%', #{c.productName}, '%')
             </if>
+            <if test="c.productMainId != null and c.productMainId != ''">
+                and ppm.id = #{c.productMainId}
+            </if>
         </where>
         order by ppi.create_time desc
     </select>
+    <select id="selectInputStats" resultType="java.util.Map">
+        select DATE_FORMAT(create_time, '%Y-%m-%d') as statDate,
+               sum(ifnull(quantity, 0)) as quantity
+#                sum(ifnull(scrap_qty, 0)) as scrapQty
+        from production_product_input
+        where create_time &gt;= #{startDate}
+          and create_time &lt;= #{endDate}
+        group by DATE_FORMAT(create_time, '%Y-%m-%d')
+        order by statDate asc
+    </select>
 
 </mapper>

--
Gitblit v1.9.3