From 0e2a5943fdcc6c7bcaf58c3dc9752c46766bf2e3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 09 九月 2024 13:15:27 +0800
Subject: [PATCH] 修改
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 47b1344..01d1242 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -54,7 +54,7 @@
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) <= #{endDate} and o.delivery = 0
+ date(fol.operate_time)>=#{startDate} and date(fol.operate_time) <= #{endDate}
<if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
</if>
@@ -554,7 +554,7 @@
<select id="getmaximum" >
- select count(*) from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE()
+ select count(*) from (select * from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE() group by operation_order_number) zu
</select>
<insert id="insertIntFinishedOperateLog" useGeneratedKeys="true" >
--
Gitblit v1.8.0