From 391c4d67ad70df01c3bb849c16e8479edb86846d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 15 10月 2025 14:04:59 +0800
Subject: [PATCH] qww

---
 Weben_CMS专用代码生成器/Code/Utility/CommonHelper.cs |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 48 insertions(+), 1 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/CommonHelper.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/CommonHelper.cs"
index 5d6d6b9..c2e293b 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/CommonHelper.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/CommonHelper.cs"
@@ -15,6 +15,32 @@
     /// </summary>
     public class CommonHelper
     {
+        /// <summary>
+        /// 鑾峰彇 鎴戠殑鏁版嵁绫诲瀷鍒嗙被鏋氫妇
+        /// </summary>
+        /// <param name="enumDT"></param>
+        /// <returns></returns>
+        public static MyDataTypeCategorizeEnum GetMyDataTypeCategorizeEnum(DataTypeEnum enumDT)
+        {
+            //澶勭悊楂樼骇select鏌ヨ 
+            switch (enumDT)
+            {
+                case DataTypeEnum.dt_bit:
+                case DataTypeEnum.dt_tinyint:
+                    return MyDataTypeCategorizeEnum.甯冨皵绫�;
+                case DataTypeEnum.dt_int:
+                case DataTypeEnum.dt_bigint:
+                case DataTypeEnum.dt_decimal:
+                case DataTypeEnum.dt_float:
+                    return MyDataTypeCategorizeEnum.鏁板瓧绫�;
+                case DataTypeEnum.dt_datetime:
+                case DataTypeEnum.dt_datetime2:
+                case DataTypeEnum.dt_datetimeoffset:
+                    return MyDataTypeCategorizeEnum.鏃ユ湡绫�;
+                default://鍓╀綑鐨勪竴寰嬭涓烘槸 瀛楃涓�  
+                    return MyDataTypeCategorizeEnum.瀛楃涓茬被;
+            }
+        }
 
         /// <summary>
         /// 鏄惁蹇界暐璇ュ垪
@@ -23,7 +49,9 @@
         /// <returns></returns>
         public static bool IsIgnore(string columnName)
         {
-            if (columnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper())
+            if (columnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+                || columnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+                )
             {
                 return true;
             }
@@ -39,8 +67,27 @@
         {
             str = str.Replace("$NameSpacePath$", param.NameSpacePath);//鍛藉悕绌洪棿
             str = str.Replace("$ChinaComment$", param.ChinaComment);//涓枃娉ㄩ噴
+            str = str.Replace("$PageMenuName$", param.PageMenuName);//涓枃娉ㄩ噴
+            str = str.Replace("$PageMenuInstanceName$", param.PageMenuInstanceName);//涓枃娉ㄩ噴
             str = str.Replace("$EntityName$", param.EntityName);//瀹炰綋绫诲悕
             str = str.Replace("$Modulelogo$", param.Modulelogo);//妯″潡绠�鍐�
+            str = str.Replace("$EntityInstanceName$", param.EntityInstanceName);//瀹炰緥鍚�
+            str = str.Replace("$TableName$", param.TableName);//琛ㄥ悕
+
+            //濡傛灉涓虹┖锛岀郴缁熼粯璁ゆ墍鏈夊瓧绗︿覆鐨勫睍绀哄垪鏌ヨ
+            var str_LikeQueryAttrs = param.LikeQueryAttrs;
+            var str_LikeQueryAttrsName = param.LikeQueryAttrsName;
+            if (string.IsNullOrEmpty(param.LikeQueryAttrs))
+            {
+                str_LikeQueryAttrs = StructStrHelper.Get_LikeQueryAttrs(param.ColumnNameList, param);
+                str_LikeQueryAttrsName = StructStrHelper.Get_LikeQueryAttrsName(param.ColumnNameList, param);
+            }
+            str = str.Replace("$LikeQueryAttrs$", str_LikeQueryAttrs);
+            str = str.Replace("$LikeQueryAttrsName$", str_LikeQueryAttrsName);
+
+            str = str.Replace("$ValidateRepeatName$", param.ValidateRepeatName);
+            str = str.Replace("$DeleteAlertAttr$", param.DeleteAlertAttr);
+            str = str.Replace("$OrderBy$", param.OrderBy);
 
         }
 

--
Gitblit v1.9.3