From 0daf61c579df262a70f40be7546d218c07047c16 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 06:36:52 +0800
Subject: [PATCH] 222

---
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs |  219 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 216 insertions(+), 3 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/StructStrHelper.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/StructStrHelper.cs"
index 73c8103..767112b 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/StructStrHelper.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/StructStrHelper.cs"
@@ -218,7 +218,7 @@
         /// </summary>
         /// <param name="columnModel"></param>
         /// <returns></returns>
-        public static string GenerateAttributeForAddModel(ColumnModel columnModel,GenerateCodeParam param)
+        public static string GenerateAttributeForAddModel(ColumnModel columnModel, GenerateCodeParam param)
         {
             try
             {
@@ -248,6 +248,11 @@
                         attrStr += "        public long" + str_NullFlag + attr + " { get; set; }\n";
                         attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
                         break;
+                    case DataTypeEnum.dt_decimal:
+                        if (columnModel.IsNullable) { str_NullFlag = "? "; }
+                        attrStr += "        public decimal" + str_NullFlag + attr + " { get; set; }\n";
+                        attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        break;
                     case DataTypeEnum.dt_int:
                         if (columnModel.IsNullable) { str_NullFlag = "? "; }
                         var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
@@ -268,6 +273,131 @@
                         break;
                 }
 
+                return attrStr;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+        /// <summary>
+        /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-鏇存柊瀹炰綋涓撶敤
+        /// </summary>
+        /// <param name="columnModel"></param>
+        /// <returns></returns>
+        public static string GenerateAttributeForUpdateModel(ColumnModel columnModel, GenerateCodeParam param)
+        {
+            try
+            {
+                string attr = columnModel.ColumnName;
+
+                string attrStr = "";
+                attrStr += $"        updateObj.{attr} = input.{attr};\n";
+
+
+                return attrStr;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+        /// <summary>
+        /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-鏇存柊瀹炰綋涓撶敤(瀵煎叆鏃�)
+        /// </summary>
+        /// <param name="columnModel"></param>
+        /// <returns></returns>
+        public static string GenerateAttributeForUpdateModelByImport(ColumnModel columnModel, GenerateCodeParam param)
+        {
+            try
+            {
+                string attr = columnModel.ColumnName;
+
+                string attrStr = "";
+                attrStr += $"        {attr} = {param.EntityInstanceName}.{attr},\n";
+
+
+                return attrStr;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+        /// <summary>
+        /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-CheckCreateOrUpdateDtoAsync涓撶敤
+        /// </summary>
+        /// <param name="columnModel"></param>
+        /// <returns></returns>
+        public static string GenerateAttributeForCheckCreateOrUpdateDtoAsync(ColumnModel columnModel, GenerateCodeParam param)
+        {
+            try
+            {
+                string attr = columnModel.ColumnName;
+
+                string attrStr = "";
+                bool isHaveMaxLength = false;
+                if (!string.IsNullOrEmpty(columnModel.DataLength))
+                {
+                    isHaveMaxLength = true;
+                }
+                if (columnModel.IsNullable == false)
+                {//蹇呭~
+                    DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
+                    switch (myDataType)
+                    {
+                        case DataTypeEnum.dt_datetime:
+                        case DataTypeEnum.dt_datetime2:
+                        case DataTypeEnum.dt_datetimeoffset:
+                            if (isHaveMaxLength)
+                            {
+                                attrStr += $"        Check.NotNull(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+                            }
+                            else
+                            {
+                                attrStr += $"        Check.NotNull(input.{attr}, \"{columnModel.Description}\");\n";
+                            }
+                            break;
+                        case DataTypeEnum.dt_bigint:
+                        case DataTypeEnum.dt_decimal:
+                            if (isHaveMaxLength)
+                            {
+                                attrStr += $"        Check.NotNull(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+                            }
+                            else
+                            {
+                                attrStr += $"        Check.NotNull(input.{attr}, \"{columnModel.Description}\");\n";
+                            }
+                            break;
+                        case DataTypeEnum.dt_int:
+                        case DataTypeEnum.dt_tinyint:
+                            if (isHaveMaxLength)
+                            {
+                                attrStr += $"        Check.NotNull(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+                            }
+                            else
+                            {
+                                attrStr += $"        Check.NotNull(input.{attr}, \"{columnModel.Description}\");\n";
+                            }
+                            break;
+                        default:
+                            if (isHaveMaxLength)
+                            {
+                                attrStr += $"        Check.NotNullOrWhiteSpace(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+                            }
+                            else
+                            {
+                                attrStr += $"        Check.NotNullOrWhiteSpace(input.{attr}, \"{columnModel.Description}\");\n";
+                            }
+                            break;
+                    }
+                }
                 return attrStr;
             }
             catch (Exception ex)
@@ -304,12 +434,17 @@
                     case DataTypeEnum.dt_datetime:
                     case DataTypeEnum.dt_datetime2:
                     case DataTypeEnum.dt_datetimeoffset:
-                        attrStr += "        public datetime" + str_NullFlag + attr + " { get; set; }\n";
+                        attrStr += "        public DateTime" + str_NullFlag + attr + " { get; set; }\n";
                         attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
                         break;
                     case DataTypeEnum.dt_bigint:
                         if (columnModel.IsNullable) { str_NullFlag = "? "; }
                         attrStr += "        public long" + str_NullFlag + attr + " { get; set; }\n";
+                        attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        break;
+                    case DataTypeEnum.dt_decimal:
+                        if (columnModel.IsNullable) { str_NullFlag = "? "; }
+                        attrStr += "        public decimal" + str_NullFlag + attr + " { get; set; }\n";
                         attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
                         break;
                     case DataTypeEnum.dt_int:
@@ -342,7 +477,7 @@
                         attrStr += "        /// <summary>\n";
                         attrStr += "        /// " + columnModel.Description + "\n";
                         attrStr += "        /// </summary>\n";
-                        attrStr += "        public string" + str_NullFlag + findEnumObj.EnumTypeDesc + " { get; set; }\n";
+                        attrStr += "        public string" + str_NullFlag + findEnumObj.EnumTypeDesc + "\n";
                         attrStr += "        { \n";
                         attrStr += "            get \n";
                         attrStr += "            { \n";
@@ -351,6 +486,79 @@
                         attrStr += "        } \n";
                     }
                 }
+
+                return attrStr;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+        /// <summary>
+        /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-Export瀹炰綋涓撶敤
+        /// </summary>
+        /// <param name="columnModel"></param>
+        /// <returns></returns>
+        public static string GenerateAttributeForExport(ColumnModel columnModel, GenerateCodeParam param)
+        {
+            try
+            {
+                string attr = columnModel.ColumnName;
+                //if (attr.ToUpper() == "DBId".ToUpper())
+                //{
+                //    var bb = "";
+                //}
+                string str_NullFlag = " ";
+
+                string attrStr = "";
+                attrStr += "        /// <summary>\n";
+                attrStr += "        /// " + columnModel.Description + "\n";
+                attrStr += "        /// </summary>\n";
+                attrStr += $"        [ExcelColumn(Name = \"{columnModel.Description}\", Width = 25)]\n";
+
+                DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
+                switch (myDataType)
+                {
+                    case DataTypeEnum.dt_datetime:
+                    case DataTypeEnum.dt_datetime2:
+                    case DataTypeEnum.dt_datetimeoffset:
+                        attrStr += "        public datetime" + str_NullFlag + attr + " { get; set; }\n";
+                        attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        break;
+                    case DataTypeEnum.dt_bigint:
+                        if (columnModel.IsNullable) { str_NullFlag = "? "; }
+                        attrStr += "        public long" + str_NullFlag + attr + " { get; set; }\n";
+                        attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        break;
+                    case DataTypeEnum.dt_decimal:
+                        if (columnModel.IsNullable) { str_NullFlag = "? "; }
+                        attrStr += "        public decimal" + str_NullFlag + attr + " { get; set; }\n";
+                        attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        break;
+                    case DataTypeEnum.dt_int:
+                        if (columnModel.IsNullable) { str_NullFlag = "? "; }
+                        var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
+                        if (findEnumObj != null)
+                        {
+                            attrStr += $"        public {findEnumObj.EnumType}" + str_NullFlag + attr + " { get; set; }\n";
+                            attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        }
+                        else
+                        {
+                            attrStr += "        public int" + str_NullFlag + attr + " { get; set; }\n";
+                            attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        }
+
+                        break;
+                    default:
+                        attrStr += "        public string" + str_NullFlag + attr + " { get; set; }\n";
+                        attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        break;
+                }
+
+
 
                 return attrStr;
             }
@@ -402,6 +610,10 @@
                         break;
                     case DataTypeEnum.dt_bigint:
                         attrStr += "        public long" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
+                        attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+                        break;
+                    case DataTypeEnum.dt_decimal:
+                        attrStr += "        public decimal" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
                         attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
                         break;
                     case DataTypeEnum.dt_int:
@@ -457,6 +669,7 @@
                     case DataTypeEnum.dt_datetimeoffset:
                         return "\n";
                     case DataTypeEnum.dt_bigint:
+                    case DataTypeEnum.dt_decimal:
                     case DataTypeEnum.dt_int:
                     case DataTypeEnum.dt_tinyint:
                         attrStr += "        public SearchFilterModeEnum " + attr + highSearchModeSuffix + " { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;\n";

--
Gitblit v1.9.3