From 6081db6f036f8ad77959e7b04cca54f7c9cc8a0d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 09:41:23 +0800
Subject: [PATCH] 优化
---
Weben_CMS专用代码生成器/Code/Utility/ListHelper.cs | 66 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 17 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..a3bac9e 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,43 @@
{
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_createTime.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_CreateId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+
+ )
+ {
+ continue;
+ }
+ newList.Add(columnModel);
+ }
+ return newList;
+ }
+
+ #endregion
/// <summary>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 creator鍜宑reateTime)
/// </summary>
@@ -48,7 +85,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 +114,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 +141,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 +194,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 +202,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,6 +212,12 @@
return newList;
}
+
+ /// <summary>
+ /// 椤甸潰琛ㄦ牸灞曠ず鐨� 瀛楁鍒楄〃
+ /// </summary>
+ /// <param name="columnNameList"></param>
+ /// <returns></returns>
public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
{
List<ColumnModel> newList = new List<ColumnModel>();
@@ -190,8 +229,7 @@
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_lastModifyTime.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
@@ -199,6 +237,7 @@
|| 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_IsDisabled.ToUpper()
//|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
)
@@ -305,7 +344,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()
@@ -331,7 +369,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()
@@ -349,12 +386,9 @@
return newList;
}
- /// <summary>
- /// 杩囨护锛屾洿鏂板疄浣撶被鏃朵笓鐢�
- /// </summary>
- /// <param name="columnNameList"></param>
- /// <returns></returns>
- public static List<ColumnModel> RemoveAttrForUpdateMode(List<ColumnModel> columnNameList)
+
+
+ public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
{
List<ColumnModel> newList = new List<ColumnModel>();
ColumnModel columnModel = null;
@@ -362,10 +396,8 @@
{
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()
--
Gitblit v1.9.3