From f00a59b4f30accf2b23ae0d58fac23d966a48d24 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 13 六月 2026 20:11:51 +0800
Subject: [PATCH] fix: 优化生产订单查询

---
 src/main/resources/mapper/production/ProductionProductOutputMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index 97bbf47..04bd6a9 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -15,7 +15,7 @@
         <result column="update_user" property="updateUser" />
     </resultMap>
 
-    <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
+    <select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.bean.dto.ProductionProductOutputDto">
         select ppo.*,
                ppm.product_no as productNo,
                pm.model
@@ -23,7 +23,7 @@
                  left join production_product_main ppm on ppo.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 ppo.product_model_id = pm.id
         <where>
             <if test="c.productNo != null and c.productNo != ''">
                 and ppm.product_no like concat('%', #{c.productNo}, '%')
@@ -35,7 +35,7 @@
         order by ppo.create_time desc
     </select>
 
-    <select id="selectOutputStats" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
+    <select id="selectOutputStats" resultType="com.ruoyi.production.bean.dto.ProductionProductOutputDto">
         select id,
                production_product_main_id as productionProductMainId,
                product_model_id as productModelId,
@@ -48,13 +48,13 @@
     </select>
 
     <select id="selectDailyOutputStats" resultType="java.util.Map">
-        select date(create_time) as statDate,
+        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_output
         where create_time &gt;= #{startDate}
           and create_time &lt;= #{endDate}
-        group by date(create_time)
+        group by DATE_FORMAT(create_time, '%Y-%m-%d')
         order by statDate asc
     </select>
 

--
Gitblit v1.9.3