From 69e1073d459f31033d141ab3433d4fbf7b4a9106 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 十二月 2025 10:52:39 +0800
Subject: [PATCH] 入库报表添加时间查询

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   65 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 20752c8..4607863 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -518,7 +518,14 @@
         left join sd.`order` o on o.order_id=fol.order_id
         left join sd.product p on p.id=od.product_id
         <where>
-            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and fol.operate_type=#{type}
+            <if test="dateType=='date'">
+                date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
+            </if>
+            <if test="dateType=='datetime'">
+                fol.operate_time>=#{startDate} and fol.operate_time &lt;= #{endDate}
+            </if>
+            and fol.operate_type=#{type}
+
             <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
                 and fol.operate_type regexp #{finishedOperateLog.operateType}
             </if>
@@ -599,7 +606,15 @@
         left join sd.`order` o on o.order_id=fol.order_id
         left join sd.product p on p.id=od.product_id
         <where>
-            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and fol.operate_type=#{type}
+            <if test="dateType=='date'">
+                date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
+            </if>
+            <if test="dateType=='datetime'">
+                fol.operate_time>=#{startDate} and fol.operate_time &lt;= #{endDate}
+            </if>
+            and fol.operate_type=#{type}
+
+
             <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
                 and fol.operate_type regexp #{finishedOperateLog.operateType}
             </if>
@@ -817,7 +832,51 @@
                  left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
                  left join sd.`order` o on o.order_id=fol.order_id
                  left join sd.product p on p.id=od.product_id
-        where  date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]} and fol.operate_type=#{type}
+        where
+                date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]}
+
+          and fol.operate_type=#{type}
+
+    </select>
+
+    <select id="exportFinishedOperateLogReportByDatetime">
+        select fol.id,
+               fol.operation_order_number,
+               fol.order_id,
+               fol.operate_type,
+               fol.process_id,
+               fol.operation_number,
+               fol.quantity,
+               fol.operator,
+               od.product_id,
+               od.product_name,
+               od.width,
+               od.height,
+               fol.stater_operation_order_number,
+               fol.end_operation_order_number,
+               fol.operate_time,
+               fol.`status`,
+               fol.is_state,
+               fol.reviewed,
+               fol.reviewed_time,
+               fol.type,
+               fol.remarks,
+               fol.area,
+               fol.money,
+               o.customer_name,
+               o.project,
+               od.price,
+               o.order_type,
+               p.thickness * fol.area as square_millimeter
+        from (select *
+              from mm.finished_operate_log aa where  aa.status!='宸蹭綔搴�') fol
+                 left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
+                 left join sd.`order` o on o.order_id=fol.order_id
+                 left join sd.product p on p.id=od.product_id
+        where
+            fol.operate_time>=#{dates[0]} and fol.operate_time &lt;= #{dates[1]}
+
+          and fol.operate_type=#{type}
 
     </select>
 

--
Gitblit v1.8.0