From a00a32e331bbf32ebaf6850150977204d9de381a Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 04 八月 2025 14:44:52 +0800
Subject: [PATCH] 修改每次修变量，由0.1改为1

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 b7266ac..3b36b31 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -118,7 +118,7 @@
                 and fol.type regexp #{finishedOperateLog.type}
             </if>
             <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
-                and fol.remarks regexp #{finishedOperateLog.remarksr}
+                and fol.remarks regexp #{finishedOperateLog.remarks}
             </if>
             <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
                 and fol.area regexp #{finishedOperateLog.area}
@@ -192,7 +192,7 @@
                 and fol.type regexp #{finishedOperateLog.type}
             </if>
             <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
-                and fol.remarks regexp #{finishedOperateLog.remarksr}
+                and fol.remarks regexp #{finishedOperateLog.remarks}
             </if>
             <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
                 and fol.area regexp #{finishedOperateLog.area}
@@ -801,10 +801,11 @@
                 and  o.delivery_address regexp #{finishedOperateLog.order.deliveryAddress}
             </if>
             <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
-                and fol.remarks regexp #{finishedOperateLog.remarksr}
+                and fol.remarks regexp #{finishedOperateLog.remarks}
             </if>
         </where>
-        group by fol.remarks,od.order_id,fol.process_id
+        group by fol.remarks,od.order_id
+        -- ,fol.process_id
         order by fol.operate_time desc
         limit #{offset},#{pageSize};
     </select>
@@ -817,6 +818,7 @@
         from (select *
         from mm.finished_operate_log aa where aa.operate_type = '鍏ュ簱'  and 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.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)
@@ -848,7 +850,7 @@
                 and  o.delivery_address regexp #{finishedOperateLog.order.deliveryAddress}
             </if>
             <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
-                and fol.remarks regexp #{finishedOperateLog.remarksr}
+                and fol.remarks regexp #{finishedOperateLog.remarks}
             </if>
         </where>
         group by fol.remarks,od.order_id,fol.process_id) as zu

--
Gitblit v1.8.0