From fc28d01cfa022d0f91ec719490342d726db2e105 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 九月 2025 08:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 56 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 9fba596..e9757b9 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -35,6 +35,7 @@
         <result column="delivery_address" property="order.deliveryAddress"/>
         <result column="project" property="order.project"/>
         <result column="customer_name" property="order.customerName"/>
+        <result column="customer_Id" property="order.customerId"/>
 
     </resultMap>
 
@@ -474,10 +475,16 @@
         fol.reviewed,
         fol.reviewed_time,
         fol.type,
-        fol.remarks
+        fol.remarks,
+        fol.area,
+        fol.money,
+        o.customer_name,
+        o.project,
+        od.price
         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
         <where>
             date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and fol.operate_type=#{type}
             <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
@@ -527,6 +534,21 @@
             </if>
             <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
                 and fol.remarks regexp #{finishedOperateLog.remarksr}
+            </if>
+            <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
+                and fol.area regexp REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')
+            </if>
+            <if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
+                and fol.money regexp REGEXP_REPLACE(#{finishedOperateLog.money},'\\.0+$','')
+            </if>
+            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
+                and o.customer_name regexp #{finishedOperateLog.order.customerName}
+            </if>
+            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.project != null and finishedOperateLog.order.project != '')">
+                and o.project regexp #{finishedOperateLog.order.project}
+            </if>
+            <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
+                and  od.price regexp #{finishedOperateLog.orderDetail.price}
             </if>
         </where>
         order by fol.`status` desc
@@ -539,6 +561,7 @@
         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
         <where>
             date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and fol.operate_type=#{type}
             <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
@@ -588,6 +611,21 @@
             </if>
             <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
                 and fol.remarks regexp #{finishedOperateLog.remarksr}
+            </if>
+            <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
+                and fol.area regexp REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')
+            </if>
+            <if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
+                and fol.money regexp REGEXP_REPLACE(#{finishedOperateLog.money},'\\.0+$','')
+            </if>
+            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
+                and o.customer_name regexp #{finishedOperateLog.order.customerName}
+            </if>
+            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.project != null and finishedOperateLog.order.project != '')">
+                and o.project regexp #{finishedOperateLog.order.project}
+            </if>
+            <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
+                and  od.price regexp #{finishedOperateLog.orderDetail.price}
             </if>
         </where>
     </select>
@@ -621,7 +659,15 @@
         )
         values (
                    #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},
-                #{flowCard.inventoryQuantity},now(),"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
+                #{flowCard.inventoryQuantity},
+        <if test="createTime != null">
+            #{createTime}
+        </if>
+        <if test="createTime == null">
+            now()
+        </if>
+                ,"鏈鏍�",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
+
                )
     </insert>
 
@@ -717,10 +763,16 @@
                fol.reviewed,
                fol.reviewed_time,
                fol.type,
-               fol.remarks
+               fol.remarks,
+               fol.area,
+               fol.money,
+               o.customer_name,
+               o.project,
+               od.price
         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
         where  date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]} and fol.operate_type=#{type}
 
     </select>
@@ -760,6 +812,7 @@
         od.height,
         o.project,
         o.customer_name,
+        o.customer_Id,
         o.delivery_address,
         fol.operate_time,
         fol.`status`,

--
Gitblit v1.8.0