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

zs

2025-06-04 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/ListHelper.cs

@@ -41,6 +41,7 @@
                    || 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())
@@ -58,7 +59,9 @@
        #region ã€é¡µé¢ã€‘列表界面

        /// <summary>
        /// é¡µé¢è¡¨æ ¼å±•ç¤ºçš„ å­—段列表
        /// 1、页面表格展示的 å­—段列表
        /// 2、页面导出列表
        /// 3、高级查询列
        /// </summary>
        /// <param name="columnNameList"></param>
        /// <returns></returns>
@@ -70,6 +73,7 @@
            {
                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()
@@ -87,6 +91,7 @@
                    || 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())
@@ -102,51 +107,53 @@

        #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;
        }
        //#region ã€é¡µé¢ã€‘高级查询显示的列

        #endregion
        ///// <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>
        /// èŽ·å–最新的列List集合(去掉 creator和createTime)
@@ -426,36 +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_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>
        /// èŽ·å–最新的列List集合(去掉 ID)