diff --git a/Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs b/Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs
index e88386f0..895d5ab8 100644
--- a/Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs
+++ b/Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs
@@ -43,5 +43,10 @@ namespace Myshipping.Application.Entity
/// 是否启用
///
public int IS_ENABLE { get; set; }
+
+ ///
+ /// 服务项目说明
+ ///
+ public string SERVICE_PROJECT_NOTE { get; set; }
}
}
diff --git a/Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs b/Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs
index a28ce9d1..c7935fbb 100644
--- a/Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs
+++ b/Myshipping.Application/Entity/TrackingSystem/StatusSkuBaseInfo.cs
@@ -46,5 +46,10 @@ namespace Myshipping.Application.Entity
/// 是否启用
///
public int IS_ENABLE { get; set; }
+
+ ///
+ /// 状态说明
+ ///
+ public string STATUS_NOTE { get; set; }
}
}
diff --git a/Myshipping.Application/Service/TrackingSystem/Dtos/QueryServiceProjectBaseDto.cs b/Myshipping.Application/Service/TrackingSystem/Dtos/QueryServiceProjectBaseDto.cs
index 87218693..1fd78933 100644
--- a/Myshipping.Application/Service/TrackingSystem/Dtos/QueryServiceProjectBaseDto.cs
+++ b/Myshipping.Application/Service/TrackingSystem/Dtos/QueryServiceProjectBaseDto.cs
@@ -52,5 +52,10 @@ namespace Myshipping.Application
/// 服务项目名称
///
public string ServiceProjectName { get; set; }
-}
+
+ ///
+ /// 服务项目说明
+ ///
+ public string ServiceProjectNote { get; set; }
+ }
}
diff --git a/Myshipping.Application/Service/TrackingSystem/Dtos/QueryStatusSkuBaseDto.cs b/Myshipping.Application/Service/TrackingSystem/Dtos/QueryStatusSkuBaseDto.cs
index 6f81b93f..e1ffd1c3 100644
--- a/Myshipping.Application/Service/TrackingSystem/Dtos/QueryStatusSkuBaseDto.cs
+++ b/Myshipping.Application/Service/TrackingSystem/Dtos/QueryStatusSkuBaseDto.cs
@@ -6,7 +6,59 @@ using System.Threading.Tasks;
namespace Myshipping.Application
{
- internal class QueryStatusSkuBaseDto
+ ///
+ ///
+ ///
+ public class QueryStatusSkuBaseDto
{
+ ///
+ /// 创建日期起始
+ ///
+ ///
+ public string CreateBegin { get; set; }
+
+ ///
+ /// 创建日期结束
+ ///
+ ///
+ public string CreateEnd { get; set; }
+
+ ///
+ /// 更新日期起始
+ ///
+ ///
+ public string UpdateBegin { get; set; }
+
+ ///
+ /// 更新日期结束
+ ///
+ ///
+ public string UpdateEnd { get; set; }
+
+ ///
+ /// 创建人
+ ///
+ public string CreateUser { get; set; }
+
+ ///
+ /// 更新人
+ ///
+ public string UpdateUser { get; set; }
+
+ ///
+ /// 是否启用 1-已启用 2-未启用
+ ///
+ ///
+ public string IsEnable { get; set; }
+
+ ///
+ /// 状态名称
+ ///
+ public string StatusSKUName { get; set; }
+
+ ///
+ /// 状态说明
+ ///
+ public string StatusSKUNote { get; set;}
}
}
diff --git a/Myshipping.Application/Service/TrackingSystem/Dtos/ServiceProjectBaseDto.cs b/Myshipping.Application/Service/TrackingSystem/Dtos/ServiceProjectBaseDto.cs
index 4b6c896a..ff5a9c7e 100644
--- a/Myshipping.Application/Service/TrackingSystem/Dtos/ServiceProjectBaseDto.cs
+++ b/Myshipping.Application/Service/TrackingSystem/Dtos/ServiceProjectBaseDto.cs
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace Myshipping.Application
{
+ ///
+ /// 服务项目
+ ///
public class ServiceProjectBaseDto
{
///
@@ -14,12 +17,12 @@ namespace Myshipping.Application
public string PKId { get; set; }
///
- /// 产品代码
+ /// 服务项目代码
///
public string ServiceProjectCode { get; set; }
///
- /// 产品名称
+ /// 服务项目名称
///
public string ServiceProjectName { get; set; }
@@ -32,5 +35,10 @@ namespace Myshipping.Application
/// 是否启用
///
public int IsEnable { get; set; }
+
+ ///
+ /// 服务项目说明
+ ///
+ public string ServiceProjectNote { get; set; }
}
}
diff --git a/Myshipping.Application/Service/TrackingSystem/Dtos/StatusSkuBaseDto.cs b/Myshipping.Application/Service/TrackingSystem/Dtos/StatusSkuBaseDto.cs
index 0a977232..aa15d1f9 100644
--- a/Myshipping.Application/Service/TrackingSystem/Dtos/StatusSkuBaseDto.cs
+++ b/Myshipping.Application/Service/TrackingSystem/Dtos/StatusSkuBaseDto.cs
@@ -6,7 +6,44 @@ using System.Threading.Tasks;
namespace Myshipping.Application
{
- internal class StatusSkuBaseDto
+ ///
+ /// 状态主表
+ ///
+ public class StatusSkuBaseDto
{
+ ///
+ /// 主键
+ ///
+ public string PKId { get; set; }
+
+ ///
+ /// 状态代码
+ ///
+ public string StatusSKUCode { get; set; }
+
+ ///
+ /// 状态名称
+ ///
+ public string StatusSKUName { get; set; }
+
+ ///
+ /// 显示颜色(背景色)
+ ///
+ public string BackgroundColor { get; set; }
+
+ ///
+ /// 显示顺序号
+ ///
+ public int SortNo { get; set; }
+
+ ///
+ /// 是否启用
+ ///
+ public int IsEnable { get; set; }
+
+ ///
+ /// 状态说明
+ ///
+ public string StatusSKUNote { get; set; }
}
}
diff --git a/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingSystemMapper.cs b/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingSystemMapper.cs
index 768ebc2b..271db239 100644
--- a/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingSystemMapper.cs
+++ b/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()
.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);
}
}
diff --git a/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs b/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs
index d5590196..90165f6b 100644
--- a/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs
+++ b/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 "))