diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index b98f2e33..e9bedaca 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -9528,6 +9528,14 @@
模板名称
+
+
+ 导出excel
+
+
+
+
+
订舱模板输入参数
diff --git a/Myshipping.Application/Service/BookingTemplate/BookingTemplateService.cs b/Myshipping.Application/Service/BookingTemplate/BookingTemplateService.cs
index 20093b2b..c5e1525e 100644
--- a/Myshipping.Application/Service/BookingTemplate/BookingTemplateService.cs
+++ b/Myshipping.Application/Service/BookingTemplate/BookingTemplateService.cs
@@ -205,10 +205,12 @@ namespace Myshipping.Application
}
- /////
- ///// 导出excel
- /////
- /////
+ ///
+ /// 导出excel
+ ///
+ ///
+ ///
+ ///
[HttpGet("/BookingTemplate/ExportExcel")]
public async Task ExportExcel([FromQuery] long bookingId, long excelTemplateId)
{
diff --git a/Myshipping.Core/Entity/CommonDB/CommonDbEntity.cs b/Myshipping.Core/Entity/CommonDB/CommonDbEntity.cs
index d7e8a827..b6ba83d0 100644
--- a/Myshipping.Core/Entity/CommonDB/CommonDbEntity.cs
+++ b/Myshipping.Core/Entity/CommonDB/CommonDbEntity.cs
@@ -36,5 +36,11 @@ namespace Myshipping.Core.Entity
/// 修改人
///
public string ModifyUser { get; set; }
+
+ ///
+ /// 排序
+ ///
+ public int Sort { get; set; }
+
}
}
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index eaa91009..d64475ea 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -1462,6 +1462,11 @@
修改人
+
+
+ 排序
+
+
代码
diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
index 55adc55d..c3a6483f 100644
--- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs
+++ b/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();
}
///
@@ -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();
}
///
@@ -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();
}
///
@@ -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();
}
///
@@ -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();
}
///
@@ -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();
}
///
/// 新增场站信息
@@ -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();
}
///
@@ -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();
}
///
/// 新增起始港信息
@@ -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();
}
///
@@ -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();
}
///
@@ -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();
}
///
/// 新增包装信息
@@ -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();
}
///
@@ -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();
}
///
@@ -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();
}
///
@@ -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();
}
///
@@ -1011,7 +1011,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
- return queryList.ToList();
+ return queryList.OrderBy(x => x.Sort).ToList();
}
///
@@ -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();
}
///
/// 新增编辑付费映射信息
@@ -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();
}
///