CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
@@ -176,7 +176,7 @@ } else { where += $"{searchParametersList[i].Name} like '%{searchParametersList[i].Value}%'"; where += $"[{searchParametersList[i].Name}] like '%{searchParametersList[i].Value}%'"; } } else @@ -188,16 +188,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; CodeManagement/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;