From 9096edb026d5d411fddeeb4281b24d67160567d2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 23 三月 2025 09:39:31 +0800
Subject: [PATCH] 查询

---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 0225218..52c425e 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1671,10 +1671,10 @@
             btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
         }
         #region 璁剧疆鎼滅储
-    
-        public static FilterEntity getFilterEntityWord(string id, string idDec, string val)
+
+        public static FilterEntity getFilterEntityWord(string id, string idDec, string val, string type)
         {
-            return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%");
+            return new FilterEntity(id, idDec + ")", " like ", "鍖呭惈)", "%" + val + "%", type);
         }
         public static List<FilterEntity> GetDilter(GridColumnCollection Columns, GridView gridView1 = null)
         {
@@ -1693,7 +1693,7 @@
                 //  fiList.Add(new FilterEntity("b.FNumber", "浣跨敤缁勭粐", " like ", "鍖呭惈", "%" + filter.Value + "%"));
                 string[] ddd = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "").Split(',');
                 //Contains([fSubsidiary], '005')
-                fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim()));
+                fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim(), col.UnboundExpression));
             }
             return fiList;
         }
@@ -1718,8 +1718,18 @@
                     }
                 }
                 else
-                    _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
-                                      itm.fileValue + "'");
+                {
+                    switch (itm.fileType)
+                    {
+                        case "鏃堕棿绫诲瀷":
+                            _sbSqlWhere.Append(" and CONVERT(nvarchar(30)," + itm.fileId+ ",23)"  + itm.fileOper + "'" + itm.fileValue + "'");
+                            break;
+                        default:
+                            _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+                            break;
+                    }
+
+                }
             }
             return _sbSqlWhere.ToString();
         }
@@ -1775,7 +1785,7 @@
                     column.OptionsColumn.ReadOnly = true;
                 if (column.Tag == null || column.Tag.ToString().Length <= 0)
                     column.OptionsFilter.AllowAutoFilter = false;
-                
+
             }
             gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
             gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -2094,10 +2104,11 @@
         {
         }
 
-        public CboItemEntity(string val, string text)
+        public CboItemEntity(string val, string text,string fType="")
         {
             Text = text;
             Value = val;
+            FType = fType;
         }
 
         /// <summary>
@@ -2109,6 +2120,8 @@
         ///     瀵硅薄鍊�
         /// </summary>
         public object Value { get; set; } = "";
+
+        public object FType { get; set; } = "";
 
         public override string ToString()
         {
@@ -2130,13 +2143,14 @@
         /// <param name="operDec">鎿嶄綔绗﹀娉�</param>
         /// <param name="val"></param>
         public FilterEntity(string id, string idDec, string oper,
-            string operDec, string val)
+            string operDec, string val, string type)
         {
             fileId = id;
             fileIdDec = idDec;
             fileOper = oper;
             fileOperDec = operDec;
             fileValue = val;
+            fileType = type;
         }
 
         public string fileId { get; set; }
@@ -2148,5 +2162,7 @@
         public string fileOperDec { get; set; }
 
         public string fileValue { get; set; }
+
+        public string fileType { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3