From e1555cbadf7c6bd0f357f6d7bfe5b8d42404411a Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 16 十二月 2025 17:17:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
index 57aacc9..f874eb2 100644
--- a/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsDispatchOrderMapper.xml
@@ -157,6 +157,10 @@
<if test="operationMode != null "> and thisTab.operation_mode = #{operationMode}</if>
<if test="quotePlanId != null "> and thisTab.quote_plan_id = #{quotePlanId}</if>
+ <if test="createBy != null and createBy != ''"> and thisTab.create_by like concat('%', #{createBy}, '%')</if>
+ <if test="updateBy != null and updateBy != ''"> and thisTab.update_by like concat('%', #{updateBy}, '%')</if>
+
+
<if test="createTimeBegin != null and createTimeBegin != '' and createTimeEnd != null and createTimeEnd != ''"> and thisTab.create_time between #{createTimeBegin} and #{createTimeEnd}</if>
<if test="updateTimeBegin != null and updateTimeBegin != '' and updateTimeEnd != null and updateTimeEnd != ''"> and thisTab.update_time between #{updateTimeBegin} and #{updateTimeEnd}</if>
<if test="confirmTimeBegin != null and confirmTimeBegin != '' and confirmTimeEnd != null and confirmTimeEnd != ''"> and thisTab.confirm_time between #{confirmTimeBegin} and #{confirmTimeEnd}</if>
--
Gitblit v1.8.0