From c15bffb8522417ef4d9885d8a5e4a2aeb79831ea Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 28 十一月 2024 15:46:21 +0800
Subject: [PATCH] 更新
---
WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs b/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
index 4622588..2f7b0b1 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Core/BaseServices/ServiceBase.cs
@@ -12,6 +12,7 @@
using System.Linq.Expressions;
using System.Reflection;
using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Core.Const;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core.Utilities;
@@ -103,7 +104,27 @@
LinqExpressionType expressionType = searchParametersList[i].DisplayType.GetLinqCondition();
if (expressionType == LinqExpressionType.Equal)
{
- where += $"{searchParametersList[i].Name} = '{results[j].Item3}'";
+ where += $"{searchParametersList[i].Name} {HtmlElementType.Equal} '{results[j].Item3}'";
+ }
+ else if (expressionType == LinqExpressionType.ThanOrEqual)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.ThanOrEqual} '{searchParametersList[i].Value}'";
+ }
+ else if (expressionType == LinqExpressionType.LessThanOrEqual)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.LessOrEqual} '{searchParametersList[i].Value}'";
+ }
+ else if (expressionType == LinqExpressionType.GreaterThan)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.GT} '{searchParametersList[i].Value}'";
+ }
+ else if (expressionType == LinqExpressionType.LessThan)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.LT} '{searchParametersList[i].Value}'";
+ }
+ else if (expressionType == LinqExpressionType.Contains)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.like} '%{searchParametersList[i].Value}%'";
}
else
{
@@ -149,7 +170,7 @@
{
return new Dictionary<string, OrderByType> {
{
- pageData.Sort,pageData.Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc
+ pageData.Sort,pageData.Order?.ToLower() == OrderByType.Asc.ToString().ToLower() ? OrderByType.Asc : OrderByType.Desc
} };
}
}
--
Gitblit v1.9.3