Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-06-04 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/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>
        /// æ˜¯å¦å¿½ç•¥è¯¥åˆ—
@@ -41,9 +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);

        }