From e08cf3df4a7f37cbb41f6f179fc8fc5d409e4ea3 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期三, 25 六月 2025 16:51:17 +0800 Subject: [PATCH] 1 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs index aa0da5e..5b84cbd 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs @@ -139,7 +139,7 @@ } else { - where += $"{searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'"; + where += $"[{searchParametersList[i].Name}] like '%{searchParametersList[i].Value}%'"; } } else @@ -151,16 +151,33 @@ } else { - where += $" and {searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'"; + where += $" and [{searchParametersList[i].Name}] like '%{searchParametersList[i].Value}%'"; } } } else { - if (string.IsNullOrEmpty(where)) - where += $"{searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'"; + if (searchParametersList[i].DisplayType.GetLinqCondition() == LinqExpressionType.ThanOrEqual) + { + if (string.IsNullOrEmpty(where)) + where += $"{searchParametersList[i].Name} >= '{searchParametersList[i].Value}'"; + else + where += $" and {searchParametersList[i].Name} {searchParametersList[i].DisplayType.GetLinqCondition()} '{searchParametersList[i].Value}'"; + } + else if (searchParametersList[i].DisplayType.GetLinqCondition() == LinqExpressionType.LessThanOrEqual) + { + if (string.IsNullOrEmpty(where)) + where += $"{searchParametersList[i].Name} <= '{searchParametersList[i].Value}'"; + else + where += $" and {searchParametersList[i].Name} <= '{searchParametersList[i].Value}'"; + } else - where += $" and {searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'"; + { + if (string.IsNullOrEmpty(where)) + where += $"{searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'"; + else + where += $" and {searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{searchParametersList[i].Value}'"; + } } } return where; -- Gitblit v1.9.3