From c451aa52aafeeac71d0c8133f5c2ae18cb23c54f Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing123>
Date: Fri, 6 Jan 2023 12:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=A6=E5=8F=B7=E3=80=81?=
 =?UTF-8?q?=E5=93=81=E5=90=8D=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Myshipping.Application.xml                | 36 +++++++-------
 .../Service/Para/Dto/ParaContractNoDto.cs     |  4 ++
 .../Service/Para/Dto/ParaDtoMapper.cs         | 21 ++++++++
 .../Service/Para/Dto/ParaGoodsCategoryDto.cs  |  3 ++
 .../Service/Para/Dto/ParaGoodsDto.cs          |  4 ++
 .../Service/Para/Interface/IParaService.cs    | 12 ++---
 .../Service/Para/ParaService.cs               | 48 +++++++++----------
 7 files changed, 80 insertions(+), 48 deletions(-)

diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index 8cecc27c..c6045b1f 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -9987,32 +9987,32 @@
             </summary>
              <example>测试1</example>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.CreateTime">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.UpdateTime">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.UpdateTime">
             <summary>
             更新时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.CreateUserId">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.CreateUserId">
             <summary>
             创建者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.CreateUserName">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.CreateUserName">
             <summary>
             创建者名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.UpdateUserId">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.UpdateUserId">
             <summary>
             修改者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.UpdateUserName">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.UpdateUserName">
             <summary>
             修改者名称
             </summary>
@@ -10032,32 +10032,32 @@
             品名分类名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.CreateTime">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.UpdateTime">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.UpdateTime">
             <summary>
             更新时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.CreateUserId">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.CreateUserId">
             <summary>
             创建者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.CreateUserName">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.CreateUserName">
             <summary>
             创建者名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.UpdateUserId">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.UpdateUserId">
             <summary>
             修改者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.UpdateUserName">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.UpdateUserName">
             <summary>
             修改者名称
             </summary>
@@ -10104,32 +10104,32 @@
             </summary>
             <example>红酒</example>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.CreateTime">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.UpdateTime">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.UpdateTime">
             <summary>
             更新时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.CreateUserId">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.CreateUserId">
             <summary>
             创建者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.CreateUserName">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.CreateUserName">
             <summary>
             创建者名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.UpdateUserId">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.UpdateUserId">
             <summary>
             修改者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.UpdateUserName">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.UpdateUserName">
             <summary>
             修改者名称
             </summary>
diff --git a/Myshipping.Application/Service/Para/Dto/ParaContractNoDto.cs b/Myshipping.Application/Service/Para/Dto/ParaContractNoDto.cs
index 6ba7a685..6532cb27 100644
--- a/Myshipping.Application/Service/Para/Dto/ParaContractNoDto.cs
+++ b/Myshipping.Application/Service/Para/Dto/ParaContractNoDto.cs
@@ -31,7 +31,11 @@ namespace Myshipping.Application
         /// </summary>
         ///  <example>测试1</example>
         public string ContractNote { get; set; }
+    }
+
 
+    public class ParaContractNoShowDto: ParaContractNoDto
+    {
         /// <summary>
         /// 创建时间
         /// </summary>
diff --git a/Myshipping.Application/Service/Para/Dto/ParaDtoMapper.cs b/Myshipping.Application/Service/Para/Dto/ParaDtoMapper.cs
index e0dd2320..5b00dffd 100644
--- a/Myshipping.Application/Service/Para/Dto/ParaDtoMapper.cs
+++ b/Myshipping.Application/Service/Para/Dto/ParaDtoMapper.cs
@@ -14,6 +14,16 @@ namespace Myshipping.Application
         public void Register(TypeAdapterConfig config)
         {
             config.ForType<ParaGoodsInfo, ParaGoodsDto>()
+                .Map(dest => dest.Id, src => src.Id)
+                .Map(dest => dest.GoodsCode, src => src.GOODS_CODE)
+                .Map(dest => dest.GoodsNameCN, src => src.GOODS_NAME_CN)
+                .Map(dest => dest.GoodsNameEN, src => src.GOODS_NAME_EN)
+                .Map(dest => dest.GoodsDesp, src => src.GOODS_DESP)
+                .Map(dest => dest.GoodsCategory, src => src.GOODS_CATEGORY)
+                .Map(dest => dest.GoodsCategoryName, src => src.GOODS_CATEGORY_NAME);
+
+
+            config.ForType<ParaGoodsInfo, ParaGoodsShowDto>()
                 .Map(dest => dest.Id, src => src.Id)
                 .Map(dest => dest.GoodsCode, src => src.GOODS_CODE)
                 .Map(dest => dest.GoodsNameCN, src => src.GOODS_NAME_CN)
@@ -39,6 +49,11 @@ namespace Myshipping.Application
 
 
             config.ForType<ParaGoodsCategoryInfo, ParaGoodsCategoryDto>()
+                .Map(dest => dest.Id, src => src.Id)
+                .Map(dest => dest.GoodsCategory, src => src.GOODS_CATEGORY)
+                .Map(dest => dest.GoodsCategoryName, src => src.GOODS_CATEGORY_NAME);
+
+            config.ForType<ParaGoodsCategoryInfo, ParaGoodsCategoryShowDto>()
                 .Map(dest => dest.Id, src => src.Id)
                 .Map(dest => dest.GoodsCategory, src => src.GOODS_CATEGORY)
                 .Map(dest => dest.GoodsCategoryName, src => src.GOODS_CATEGORY_NAME)
@@ -57,6 +72,12 @@ namespace Myshipping.Application
 
 
             config.ForType<ParaContractNoInfo, ParaContractNoDto>()
+                .Map(dest => dest.Id, src => src.Id)
+                .Map(dest => dest.ContractNo, src => src.CONTRACT_NO)
+                .Map(dest => dest.ContractName, src => src.CONTRACT_NAME)
+                .Map(dest => dest.ContractNote, src => src.CONTRACT_NOTE);
+
+            config.ForType<ParaContractNoInfo, ParaContractNoShowDto>()
                 .Map(dest => dest.Id, src => src.Id)
                 .Map(dest => dest.ContractNo, src => src.CONTRACT_NO)
                 .Map(dest => dest.ContractName, src => src.CONTRACT_NAME)
diff --git a/Myshipping.Application/Service/Para/Dto/ParaGoodsCategoryDto.cs b/Myshipping.Application/Service/Para/Dto/ParaGoodsCategoryDto.cs
index 911318d7..205fbab4 100644
--- a/Myshipping.Application/Service/Para/Dto/ParaGoodsCategoryDto.cs
+++ b/Myshipping.Application/Service/Para/Dto/ParaGoodsCategoryDto.cs
@@ -23,7 +23,10 @@ namespace Myshipping.Application
         /// 品名分类名称
         /// </summary>
         public string GoodsCategoryName { get; set; }
+    }
 
+    public class ParaGoodsCategoryShowDto: ParaGoodsCategoryDto
+    {
         /// <summary>
         /// 创建时间
         /// </summary>
diff --git a/Myshipping.Application/Service/Para/Dto/ParaGoodsDto.cs b/Myshipping.Application/Service/Para/Dto/ParaGoodsDto.cs
index d4488546..0468523d 100644
--- a/Myshipping.Application/Service/Para/Dto/ParaGoodsDto.cs
+++ b/Myshipping.Application/Service/Para/Dto/ParaGoodsDto.cs
@@ -51,7 +51,11 @@ namespace Myshipping.Application
         /// </summary>
         /// <example>红酒</example>
         public string GoodsCategoryName { get; set; }
+    }
+
 
+    public class ParaGoodsShowDto: ParaGoodsDto
+    {
         /// <summary>
         /// 创建时间
         /// </summary>
diff --git a/Myshipping.Application/Service/Para/Interface/IParaService.cs b/Myshipping.Application/Service/Para/Interface/IParaService.cs
index 98357c8f..aced3e8e 100644
--- a/Myshipping.Application/Service/Para/Interface/IParaService.cs
+++ b/Myshipping.Application/Service/Para/Interface/IParaService.cs
@@ -27,7 +27,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="Id">品名主键</param>
         /// <returns>返回回执</returns>
-        Task<ParaGoodsDto> GetParaGoodsInfo(long Id);
+        Task<ParaGoodsShowDto> GetParaGoodsInfo(long Id);
 
         /// <summary>
         /// 检索品名参数
@@ -35,7 +35,7 @@ namespace Myshipping.Application
         /// <param name="queryItem">检索值</param>
         /// <param name="top">默认最大行数</param>
         /// <returns>返回回执</returns>
-        Task<List<ParaGoodsDto>> QueryParaGoodsInfo(string queryItem, int top = 10);
+        Task<List<ParaGoodsShowDto>> QueryParaGoodsInfo(string queryItem, int top = 10);
 
         /// <summary>
         /// 品名参数台账查询
@@ -56,7 +56,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="Id">品名分类主键</param>
         /// <returns>返回回执</returns>
-        Task<ParaGoodsCategoryDto> GetParaGoodsCategoryInfo(long Id);
+        Task<ParaGoodsCategoryShowDto> GetParaGoodsCategoryInfo(long Id);
 
         /// <summary>
         /// 检索品名分类参数
@@ -64,7 +64,7 @@ namespace Myshipping.Application
         /// <param name="queryItem">检索值</param>
         /// <param name="top">默认最大行数</param>
         /// <returns>返回回执</returns>
-        Task<List<ParaGoodsCategoryDto>> QueryParaGoodsCategoryInfo(string queryItem, int top = 10);
+        Task<List<ParaGoodsCategoryShowDto>> QueryParaGoodsCategoryInfo(string queryItem, int top = 10);
 
         /// <summary>
         /// 作废品名分类参数
@@ -93,7 +93,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="Id">约号主键</param>
         /// <returns>返回回执</returns>
-        Task<ParaContractNoDto> GetParaContractNoInfo(long Id);
+        Task<ParaContractNoShowDto> GetParaContractNoInfo(long Id);
 
         /// <summary>
         /// 检索约号参数
@@ -101,7 +101,7 @@ namespace Myshipping.Application
         /// <param name="queryItem">检索值</param>
         /// <param name="top">默认最大行数</param>
         /// <returns>返回回执</returns>
-        Task<List<ParaContractNoDto>> QuerytParaContractNoInfo(string queryItem, int top = 10);
+        Task<List<ParaContractNoShowDto>> QuerytParaContractNoInfo(string queryItem, int top = 10);
 
         /// <summary>
         /// 作废约号参数
diff --git a/Myshipping.Application/Service/Para/ParaService.cs b/Myshipping.Application/Service/Para/ParaService.cs
index 2a4af5bf..c52ac215 100644
--- a/Myshipping.Application/Service/Para/ParaService.cs
+++ b/Myshipping.Application/Service/Para/ParaService.cs
@@ -170,9 +170,9 @@ namespace Myshipping.Application
         /// <param name="Id">品名主键</param>
         /// <returns>返回回执</returns>
         [HttpGet("/Para/GetParaGoodsInfo")]
-        public async Task<ParaGoodsDto> GetParaGoodsInfo([FromQuery]long Id)
+        public async Task<ParaGoodsShowDto> GetParaGoodsInfo([FromQuery]long Id)
         {
-            ParaGoodsDto model = null;
+            ParaGoodsShowDto model = null;
 
             try
             {
@@ -182,7 +182,7 @@ namespace Myshipping.Application
                     throw Oops.Oh($"获取品名参数失败");
 
 
-                model = info.Adapt<ParaGoodsDto>();
+                model = info.Adapt<ParaGoodsShowDto>();
 
             }
             catch (Exception ex)
@@ -200,9 +200,9 @@ namespace Myshipping.Application
         /// <param name="top">默认最大行数</param>
         /// <returns>返回回执</returns>
         [HttpGet("/Para/QueryParaGoodsInfo")]
-        public async Task<List<ParaGoodsDto>> QueryParaGoodsInfo([FromQuery] string queryItem, [FromQuery] int top = 10)
+        public async Task<List<ParaGoodsShowDto>> QueryParaGoodsInfo([FromQuery] string queryItem, [FromQuery] int top = 10)
         {
-            List<ParaGoodsDto> list = new List<ParaGoodsDto>();
+            List<ParaGoodsShowDto> list = new List<ParaGoodsShowDto>();
 
             try
             {
@@ -224,7 +224,7 @@ namespace Myshipping.Application
                 var goodsList = await query.Take(top).ToListAsync();
 
                 if (goodsList.Count > 0)
-                    list = goodsList.Select(t => t.Adapt<ParaGoodsDto>()).ToList();
+                    list = goodsList.Select(t => t.Adapt<ParaGoodsShowDto>()).ToList();
 
             }
             catch (Exception ex)
@@ -281,7 +281,7 @@ namespace Myshipping.Application
 
             //这里因为返回给前端的台账数据是DTO，所以这里排序时候需要转换成Entity对应的字段
             if (!string.IsNullOrWhiteSpace(QuerySearch.SortField))
-                entityOrderCol = MapsterExtHelper.GetAdaptProperty<ParaGoodsDto, ParaGoodsInfo>(QuerySearch.SortField);
+                entityOrderCol = MapsterExtHelper.GetAdaptProperty<ParaGoodsShowDto, ParaGoodsInfo>(QuerySearch.SortField);
 
             var entities = await _paraGoodsInfoRepository.AsQueryable().Filter(null, true)
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.GoodsCode), t => t.GOODS_CODE.Contains(QuerySearch.GoodsCode.Trim(), StringComparison.OrdinalIgnoreCase))
@@ -303,7 +303,7 @@ namespace Myshipping.Application
                 PageSize = entities.PageSize,
                 TotalPage = entities.TotalPages,
                 TotalRows = entities.TotalCount,
-                Rows = entities.Items.Select(t => t.Adapt<ParaGoodsDto>()).ToList()
+                Rows = entities.Items.Select(t => t.Adapt<ParaGoodsShowDto>()).ToList()
             };
         }
 
@@ -376,9 +376,9 @@ namespace Myshipping.Application
         /// <param name="Id">品名分类主键</param>
         /// <returns>返回回执</returns>
         [HttpGet("/Para/GetParaGoodsCategoryInfo")]
-        public async Task<ParaGoodsCategoryDto> GetParaGoodsCategoryInfo(long Id)
+        public async Task<ParaGoodsCategoryShowDto> GetParaGoodsCategoryInfo(long Id)
         {
-            ParaGoodsCategoryDto model = null;
+            ParaGoodsCategoryShowDto model = null;
 
             try
             {
@@ -388,7 +388,7 @@ namespace Myshipping.Application
                     throw Oops.Oh($"获取品名分类参数失败");
 
 
-                model = info.Adapt<ParaGoodsCategoryDto>();
+                model = info.Adapt<ParaGoodsCategoryShowDto>();
 
             }
             catch (Exception ex)
@@ -406,9 +406,9 @@ namespace Myshipping.Application
         /// <param name="top">默认最大行数</param>
         /// <returns>返回回执</returns>
         [HttpGet("/Para/QueryParaGoodsCategoryInfo")]
-        public async Task<List<ParaGoodsCategoryDto>> QueryParaGoodsCategoryInfo([FromQuery] string queryItem, [FromQuery] int top = 10)
+        public async Task<List<ParaGoodsCategoryShowDto>> QueryParaGoodsCategoryInfo([FromQuery] string queryItem, [FromQuery] int top = 10)
         {
-            List<ParaGoodsCategoryDto> list = new List<ParaGoodsCategoryDto>();
+            List<ParaGoodsCategoryShowDto> list = new List<ParaGoodsCategoryShowDto>();
 
             try
             {
@@ -427,7 +427,7 @@ namespace Myshipping.Application
                 var currList = await query.Take(top).ToListAsync();
 
                 if (currList.Count > 0)
-                    list = currList.Select(t => t.Adapt<ParaGoodsCategoryDto>()).ToList();
+                    list = currList.Select(t => t.Adapt<ParaGoodsCategoryShowDto>()).ToList();
 
             }
             catch (Exception ex)
@@ -549,7 +549,7 @@ namespace Myshipping.Application
 
             //这里因为返回给前端的台账数据是DTO，所以这里排序时候需要转换成Entity对应的字段
             if (!string.IsNullOrWhiteSpace(QuerySearch.SortField))
-                entityOrderCol = MapsterExtHelper.GetAdaptProperty<ParaGoodsCategoryDto, ParaGoodsCategoryInfo>(QuerySearch.SortField);
+                entityOrderCol = MapsterExtHelper.GetAdaptProperty<ParaGoodsCategoryShowDto, ParaGoodsCategoryInfo>(QuerySearch.SortField);
 
             var entities = await _paraGoodsCategoryInfoRepository.AsQueryable().Filter(null, true)
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.GoodsCategory), t => t.GOODS_CATEGORY.Contains(QuerySearch.GoodsCategory.Trim(), StringComparison.OrdinalIgnoreCase))
@@ -568,7 +568,7 @@ namespace Myshipping.Application
                 PageSize = entities.PageSize,
                 TotalPage = entities.TotalPages,
                 TotalRows = entities.TotalCount,
-                Rows = entities.Items.Select(t => t.Adapt<ParaGoodsCategoryDto>()).ToList()
+                Rows = entities.Items.Select(t => t.Adapt<ParaGoodsCategoryShowDto>()).ToList()
             };
         }
         #endregion
@@ -633,9 +633,9 @@ namespace Myshipping.Application
         /// <param name="Id">约号主键</param>
         /// <returns>返回回执</returns>
         [HttpGet("/Para/GetParaContractNoInfo")]
-        public async Task<ParaContractNoDto> GetParaContractNoInfo(long Id)
+        public async Task<ParaContractNoShowDto> GetParaContractNoInfo(long Id)
         {
-            ParaContractNoDto model = null;
+            ParaContractNoShowDto model = null;
 
             try
             {
@@ -645,7 +645,7 @@ namespace Myshipping.Application
                     throw Oops.Oh($"获取约号参数失败");
 
 
-                model = info.Adapt<ParaContractNoDto>();
+                model = info.Adapt<ParaContractNoShowDto>();
 
             }
             catch (Exception ex)
@@ -665,9 +665,9 @@ namespace Myshipping.Application
         /// <param name="top">默认最大行数</param>
         /// <returns>返回回执</returns>
         [HttpGet("/Para/QuerytParaContractNoInfo")]
-        public async Task<List<ParaContractNoDto>> QuerytParaContractNoInfo([FromQuery] string queryItem, [FromQuery] int top = 10)
+        public async Task<List<ParaContractNoShowDto>> QuerytParaContractNoInfo([FromQuery] string queryItem, [FromQuery] int top = 10)
         {
-            List<ParaContractNoDto> list = new List<ParaContractNoDto>();
+            List<ParaContractNoShowDto> list = new List<ParaContractNoShowDto>();
 
             try
             {
@@ -687,7 +687,7 @@ namespace Myshipping.Application
                 var currList = await query.Take(top).ToListAsync();
 
                 if (currList.Count > 0)
-                    list = currList.Select(t => t.Adapt<ParaContractNoDto>()).ToList();
+                    list = currList.Select(t => t.Adapt<ParaContractNoShowDto>()).ToList();
 
             }
             catch (Exception ex)
@@ -803,7 +803,7 @@ namespace Myshipping.Application
 
             //这里因为返回给前端的台账数据是DTO，所以这里排序时候需要转换成Entity对应的字段
             if (!string.IsNullOrWhiteSpace(QuerySearch.SortField))
-                entityOrderCol = MapsterExtHelper.GetAdaptProperty<ParaContractNoDto, ParaContractNoInfo>(QuerySearch.SortField);
+                entityOrderCol = MapsterExtHelper.GetAdaptProperty<ParaContractNoShowDto, ParaContractNoInfo>(QuerySearch.SortField);
 
             var entities = await _paraContractNoInfoRepository.AsQueryable().Filter(null, true)
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.ContractNo), t => t.CONTRACT_NO.Contains(QuerySearch.ContractNo.Trim(), StringComparison.OrdinalIgnoreCase))
@@ -823,7 +823,7 @@ namespace Myshipping.Application
                 PageSize = entities.PageSize,
                 TotalPage = entities.TotalPages,
                 TotalRows = entities.TotalCount,
-                Rows = entities.Items.Select(t => t.Adapt<ParaContractNoDto>()).ToList()
+                Rows = entities.Items.Select(t => t.Adapt<ParaContractNoShowDto>()).ToList()
             };
         }
         #endregion