公共库排序

Myshipping.Application/Myshipping.Application.xml

@@ -9528,6 +9528,14 @@
             <param name="Id">模板名称</param>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Application.BookingTemplateService.ExportExcel(System.Int64,System.Int64)">
+            <summary>
+            导出excel
+            </summary>
+            <param name="bookingId"></param>
+            <param name="excelTemplateId"></param>
+            <returns></returns>
+        </member>
         <member name="T:Myshipping.Application.BookingTemplateInput">
             <summary>
             订舱模板输入参数

Myshipping.Application/Service/BookingTemplate/BookingTemplateService.cs

@@ -205,10 +205,12 @@ namespace Myshipping.Application
         }
 
 
-        ///// <summary>
-        ///// 导出excel
-        ///// </summary>
-        ///// <returns></returns>
+        /// <summary>
+        /// 导出excel
+        /// </summary>
+        /// <param name="bookingId"></param>
+        /// <param name="excelTemplateId"></param>
+        /// <returns></returns>
         [HttpGet("/BookingTemplate/ExportExcel")]
         public async Task<dynamic> ExportExcel([FromQuery] long bookingId, long excelTemplateId)
         {

Myshipping.Core/Entity/CommonDB/CommonDbEntity.cs

@@ -36,5 +36,11 @@ namespace Myshipping.Core.Entity
         /// 修改人
         /// </summary>
         public string ModifyUser { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+
     }
 }

Myshipping.Core/Myshipping.Core.xml

@@ -1462,6 +1462,11 @@
             修改人
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Entity.CommonDbEntity.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
         <member name="P:Myshipping.Core.Entity.CommonModule.Code">
             <summary>
             代码

Myshipping.Core/Service/CommonDB/CommonDBService.cs

@@ -114,7 +114,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         var list = await _sysCacheService.GetAllCodeCarrier();
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
              || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -164,7 +164,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         var queryList = list.Where(x => x.Module == input.Module)
              .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
              || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -215,7 +215,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
            return  list.Take(10);
         }
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
-        return queryList.Take(10).ToList();
+        return queryList.OrderBy(x=>x.Sort).Take(10).ToList();
     }
 
     /// <summary>
@@ -267,7 +267,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
             
           .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
              || x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -319,7 +319,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -368,7 +368,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
     /// <summary>
     /// 新增场站信息
@@ -423,7 +423,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
             .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
              || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -476,7 +476,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
              || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EdiCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
     /// <summary>
     /// 新增起始港信息
@@ -530,7 +530,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
          .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
              || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -584,7 +584,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
              || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EdiCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
 
@@ -639,7 +639,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
              || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -687,7 +687,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
             || x.EdiCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
-        return queryList.ToList();
+        return queryList.OrderBy(x=>x.Sort).ToList();
     }
     /// <summary>
     /// 新增包装信息
@@ -740,7 +740,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
              || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -787,7 +787,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
             || x.EdiCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
-        return queryList.OrderBy(x=>x.Code).ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -842,7 +842,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
              || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -891,7 +891,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
             || x.EdiCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)).OrderByDescending(x=>x.CreateTime);
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
 
@@ -959,7 +959,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
              || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -1011,7 +1011,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
 
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>
@@ -1062,7 +1062,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         var queryList = list.Where(x => x.Module == input.Module)
             .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
              || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
     /// <summary>
     /// 新增编辑付费映射信息
@@ -1109,7 +1109,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
             || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
-        return queryList.ToList();
+        return queryList.OrderBy(x => x.Sort).ToList();
     }
 
     /// <summary>