From af29ed5e850186b1e89f764b167a1318bfb401a3 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 21:56:15 +0800
Subject: [PATCH] 增加 高级查询组件
---
Weben_CMS专用代码生成器/Code/Utility/ListHelper.cs | 243 +++++++++++++++++++++++++++++-------------------
1 files changed, 148 insertions(+), 95 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
index 254cd17..ebae23e 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
@@ -9,6 +9,152 @@
{
public class ListHelper
{
+ #region 銆愰〉闈€�戞柊澧炵晫闈€�佺紪杈戠晫闈�
+
+ /// <summary>
+ /// 杩囨护锛屾洿鏂板疄浣撶被鏃朵笓鐢�
+ /// </summary>
+ /// <param name="columnNameList"></param>
+ /// <returns></returns>
+ public static List<ColumnModel> RemoveAttrForUpdateMode(List<ColumnModel> columnNameList)
+ {
+ List<ColumnModel> newList = new List<ColumnModel>();
+ ColumnModel columnModel = null;
+ for (int i = 0; i < columnNameList.Count; i++)
+ {
+ columnModel = columnNameList[i];
+ if (
+ columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_IsDisabled.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+ || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
+ )
+ {
+ continue;
+ }
+ newList.Add(columnModel);
+ }
+ return newList;
+ }
+
+ #endregion
+
+ #region 銆愰〉闈€�戝垪琛ㄧ晫闈�
+
+ /// <summary>
+ /// 1銆侀〉闈㈣〃鏍煎睍绀虹殑 瀛楁鍒楄〃
+ /// 2銆侀〉闈㈠鍑哄垪琛�
+ /// 3銆侀珮绾ф煡璇㈠垪
+ /// </summary>
+ /// <param name="columnNameList"></param>
+ /// <returns></returns>
+ public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
+ {
+ List<ColumnModel> newList = new List<ColumnModel>();
+ ColumnModel columnModel = null;
+ for (int i = 0; i < columnNameList.Count; i++)
+ {
+ columnModel = columnNameList[i];
+ if (
+
+ columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_IsDisabled.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+ || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
+
+ )
+ {
+ continue;
+ }
+ newList.Add(columnModel);
+ }
+ return newList;
+ }
+
+ #endregion
+
+
+
+ //#region 銆愰〉闈€�戦珮绾ф煡璇㈡樉绀虹殑鍒�
+
+ ///// <summary>
+ ///// 銆愰〉闈€�戦珮绾ф煡璇㈡樉绀虹殑鍒�
+ ///// </summary>
+ ///// <param name="columnNameList"></param>
+ ///// <returns></returns>
+ //public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
+ //{
+ // List<ColumnModel> newList = new List<ColumnModel>();
+ // ColumnModel columnModel = null;
+ // for (int i = 0; i < columnNameList.Count; i++)
+ // {
+ // columnModel = columnNameList[i];
+ // if (
+ // columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
+ // //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+ // //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+ // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+ // //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
+ // //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
+ // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
+ // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+ // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
+ // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+ // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
+ // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+
+ // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+ // || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
+ // )
+ // {
+ // continue;
+ // }
+ // newList.Add(columnModel);
+ // }
+ // return newList;
+ //}
+
+ //#endregion
+
/// <summary>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 creator鍜宑reateTime)
/// </summary>
@@ -48,7 +194,6 @@
columnModel = columnNameList[i];
if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
@@ -78,7 +223,6 @@
if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
@@ -106,7 +250,6 @@
if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
)
@@ -160,7 +303,6 @@
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
@@ -169,7 +311,7 @@
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
-
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_IsDisabled.ToUpper()
)
{
continue;
@@ -179,36 +321,8 @@
return newList;
}
- public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
- {
- List<ColumnModel> newList = new List<ColumnModel>();
- ColumnModel columnModel = null;
- for (int i = 0; i < columnNameList.Count; i++)
- {
- columnModel = columnNameList[i];
- if (
- columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
- // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
- //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
- //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
- )
- {
- continue;
- }
- newList.Add(columnModel);
- }
- return newList;
- }
+
/// <summary>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 Id锛孋reateId锛孧odifyId)
@@ -305,7 +419,6 @@
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
@@ -320,69 +433,9 @@
return newList;
}
- public static List<ColumnModel> RemoveAttrForExport(List<ColumnModel> columnNameList)
- {
- List<ColumnModel> newList = new List<ColumnModel>();
- ColumnModel columnModel = null;
- for (int i = 0; i < columnNameList.Count; i++)
- {
- columnModel = columnNameList[i];
- if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
- )
- {
- continue;
- }
- newList.Add(columnModel);
- }
- return newList;
- }
- /// <summary>
- /// 杩囨护锛屾洿鏂板疄浣撶被鏃朵笓鐢�
- /// </summary>
- /// <param name="columnNameList"></param>
- /// <returns></returns>
- public static List<ColumnModel> RemoveAttrForUpdateMode(List<ColumnModel> columnNameList)
- {
- List<ColumnModel> newList = new List<ColumnModel>();
- ColumnModel columnModel = null;
- for (int i = 0; i < columnNameList.Count; i++)
- {
- columnModel = columnNameList[i];
- if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
- )
- {
- continue;
- }
- newList.Add(columnModel);
- }
- return newList;
- }
/// <summary>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 ID)
--
Gitblit v1.9.3