修改服务项目管理

Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs

@@ -43,5 +43,10 @@ namespace Myshipping.Application.Entity
         /// 是否启用
         /// </summary>
         public int IS_ENABLE { get; set; }
+
+        /// <summary>
+        /// 服务项目说明
+        /// </summary>
+        public string SERVICE_PROJECT_NOTE { get; set; }
     }
 }

Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs

@@ -46,5 +46,10 @@ namespace Myshipping.Application.Entity
         /// 是否启用
         /// </summary>
         public int IS_ENABLE { get; set; }
+
+        /// <summary>
+        /// 状态说明
+        /// </summary>
+        public string STATUS_NOTE { get; set; }
     }
 }

Myshipping.Application/Service/TrackingSystem/Dtos/QueryServiceProjectBaseDto.cs

@@ -52,5 +52,10 @@ namespace Myshipping.Application
         /// 服务项目名称
         /// </summary>
         public string ServiceProjectName { get; set; }
+
+        /// <summary>
+        /// 服务项目说明
+        /// </summary>
+        public string ServiceProjectNote { get; set; }
     }
 }

Myshipping.Application/Service/TrackingSystem/Dtos/QueryStatusSkuBaseDto.cs

@@ -6,7 +6,59 @@ using System.Threading.Tasks;
 
 namespace Myshipping.Application
 {
-    internal class QueryStatusSkuBaseDto
+    /// <summary>
+    /// 
+    /// </summary>
+    public class QueryStatusSkuBaseDto
     {
+        /// <summary>
+        /// 创建日期起始
+        /// </summary>
+        /// <example></example>
+        public string CreateBegin { get; set; }
+
+        /// <summary>
+        /// 创建日期结束
+        /// </summary>
+        ///  <example></example>
+        public string CreateEnd { get; set; }
+
+        /// <summary>
+        /// 更新日期起始
+        /// </summary>
+        /// <example></example>
+        public string UpdateBegin { get; set; }
+
+        /// <summary>
+        /// 更新日期结束
+        /// </summary>
+        ///  <example></example>
+        public string UpdateEnd { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateUser { get; set; }
+
+        /// <summary>
+        /// 更新人
+        /// </summary>
+        public string UpdateUser { get; set; }
+
+        /// <summary>
+        /// 是否启用 1-已启用 2-未启用
+        /// </summary>
+        ///  <example></example>
+        public string IsEnable { get; set; }
+
+        /// <summary>
+        /// 状态名称
+        /// </summary>
+        public string StatusSKUName { get; set; }
+
+        /// <summary>
+        /// 状态说明
+        /// </summary>
+        public string StatusSKUNote { get; set;}
     }
 }

Myshipping.Application/Service/TrackingSystem/Dtos/ServiceProjectBaseDto.cs

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
 
 namespace Myshipping.Application
 {
+    /// <summary>
+    /// 服务项目
+    /// </summary>
     public class ServiceProjectBaseDto
     {
         /// <summary>
@@ -14,12 +17,12 @@ namespace Myshipping.Application
         public string PKId { get; set; }
 
         /// <summary>
-        /// 产品代码
+        /// 服务项目代码
         /// </summary>
         public string ServiceProjectCode { get; set; }
 
         /// <summary>
-        /// 产品名称
+        /// 服务项目名称
         /// </summary>
         public string ServiceProjectName { get; set; }
 
@@ -32,5 +35,10 @@ namespace Myshipping.Application
         /// 是否启用
         /// </summary>
         public int IsEnable { get; set; }
+
+        /// <summary>
+        /// 服务项目说明
+        /// </summary>
+        public string ServiceProjectNote { get; set; }
     }
 }

Myshipping.Application/Service/TrackingSystem/Dtos/StatusSkuBaseDto.cs

@@ -6,7 +6,44 @@ using System.Threading.Tasks;
 
 namespace Myshipping.Application
 {
-    internal class StatusSkuBaseDto
+    /// <summary>
+    /// 状态主表
+    /// </summary>
+    public class StatusSkuBaseDto
     {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string PKId { get; set; }
+
+        /// <summary>
+        /// 状态代码
+        /// </summary>
+        public string StatusSKUCode { get; set; }
+
+        /// <summary>
+        /// 状态名称
+        /// </summary>
+        public string StatusSKUName { get; set; }
+
+        /// <summary>
+        /// 显示颜色(背景色)
+        /// </summary>
+        public string BackgroundColor { get; set; }
+
+        /// <summary>
+        /// 显示顺序号
+        /// </summary>
+        public int SortNo { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public int IsEnable { get; set; }
+
+        /// <summary>
+        /// 状态说明
+        /// </summary>
+        public string StatusSKUNote { get; set; }
     }
 }

Myshipping.Application/Service/TrackingSystem/Dtos/TrackingSystemMapper.cs

@@ -19,7 +19,8 @@ namespace Myshipping.Application
             .Map(dest => dest.PK_ID, src => src.PKId)
             .Map(dest => dest.SERVICE_PROJECT_CODE, src => src.ServiceProjectCode)
             .Map(dest => dest.SERVICE_PROJECT_NAME, src => src.ServiceProjectName)
-            .Map(dest => dest.SORT_NO, src => src.SortNo);
+            .Map(dest => dest.SORT_NO, src => src.SortNo)
+            .Map(dest => dest.SERVICE_PROJECT_NOTE, src => src.ServiceProjectNote);
 
             config.ForType<ServiceProjectBaseInfo, ServiceProjectBaseShowDto>()
             .Map(dest => dest.PKId, src => src.PK_ID)
@@ -31,8 +32,8 @@ namespace Myshipping.Application
             .Map(dest => dest.CreatedUserId, src => src.CreatedUserId)
             .Map(dest => dest.CreatedUserName, src => src.CreatedUserName)
             .Map(dest => dest.UpdatedUserId, src => src.UpdatedUserId)
-            .Map(dest => dest.UpdatedUserName, src => src.UpdatedUserName);
-
+            .Map(dest => dest.UpdatedUserName, src => src.UpdatedUserName)
+            .Map(dest => dest.ServiceProjectNote, src => src.SERVICE_PROJECT_NOTE);
 
         }
     }

Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs

@@ -466,6 +466,7 @@ namespace Myshipping.Application
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.IsEnable) && QuerySearch.IsEnable == "2", t => t.IS_ENABLE == 0)
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.ServiceProjectName), t => t.SERVICE_PROJECT_NAME.Contains(QuerySearch.ServiceProjectName)|| 
                                         t.SERVICE_PROJECT_CODE.Contains(QuerySearch.ServiceProjectName))
+                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.ServiceProjectNote), t => t.SERVICE_PROJECT_NOTE.Contains(QuerySearch.ServiceProjectNote))
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.CreateUser), t => t.CreatedUserName.Contains(QuerySearch.CreateUser))
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.UpdateUser), t => t.UpdatedUserName.Contains(QuerySearch.UpdateUser))
                                      .OrderBy(entityOrderCol + (QuerySearch.descSort ? " asc " : " desc "))