From a9b2685d4e541d0416870b90fc8b2ba893601ab7 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Mon, 5 Dec 2022 17:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingOrderService.cs       | 20 +++--
 .../Service/CommonDB/CommonDBService.cs       | 81 +++++--------------
 .../Service/CommonDB/Dto/QueryDto.cs          | 30 ++-----
 3 files changed, 42 insertions(+), 89 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index a9557a58..1cfbd663 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -144,7 +144,7 @@ namespace Myshipping.Application
                  .WhereIF(input.BBSDATE != null, u => u.BSDATE >= input.BBSDATE)
                  .WhereIF(input.EBSDATE != null, u => u.BSDATE <= input.EBSDATE)
                  .WhereIF(!string.IsNullOrWhiteSpace(input.MBLNO)&&!input.MBLNO.Contains(','), u =>u.MBLNO.Contains(input.MBLNO.Trim()))
-                   .WhereIF(!string.IsNullOrWhiteSpace(input.HBLNO) && !input.HBLNO.Contains(','), u => u.HBLNO.Contains(input.HBLNO.Trim()))
+                 .WhereIF(!string.IsNullOrWhiteSpace(input.HBLNO) && !input.HBLNO.Contains(','), u => u.HBLNO.Contains(input.HBLNO.Trim()))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.MBLNO) && input.MBLNO.Contains(','), u => input.MBLNO.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).Contains(u.MBLNO.Trim()))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.HBLNO) && input.HBLNO.Contains(','), u => input.HBLNO.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).Contains(u.HBLNO.Trim()))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.BOOKINGNO), u => u.BOOKINGNO.Contains(input.BOOKINGNO))
@@ -877,7 +877,7 @@ namespace Myshipping.Application
         /// </summary>
         [AllowAnonymous]
         [SqlSugarUnitOfWork]
-        [NonAction]
+        [HttpPost("/BookingOrder/AddBookingStatusLog")]
         public async Task AddBookingStatusLog(List<BookingStatusLogDto> all)
         {
 
@@ -898,18 +898,25 @@ namespace Myshipping.Application
                 bookingStatusLog.Status = item.Status;
                 bookingStatusLog.OpTime = item.OpTime;
                 bookingStatusLog.MBLNO = item.MBLNO;
-                var id = await _repStatuslog.InsertReturnSnowflakeIdAsync(bookingStatusLog);
+                await _repStatuslog.InsertAsync(bookingStatusLog);
+                //var list=_repBookingStatus.AsQueryable().InnerJoin<List<SysDictData>>((d,t)=>d.StaCode==t.C)
                 if (item.detail != null && item.detail.Count > 0)
                 {
                     foreach (var dt in item.detail)
                     {
                         var BookingStatusLogDetail = new BookingStatusLogDetail();
-                        BookingStatusLogDetail.PId = id;
+                        BookingStatusLogDetail.PId = bookingStatusLog.Id;
                         BookingStatusLogDetail.Status = dt.Status;
                         BookingStatusLogDetail.CNTRNO = dt.CNTRNO;
                         BookingStatusLogDetail.OPTime = dt.OPTime;
                         await _statuslogdetail.InsertAsync(BookingStatusLogDetail);
-
+                        if (dt.Status== "舱单") { 
+                        
+                        
+                        
+                        
+                        
+                        }
 
                     }
                 }
@@ -917,6 +924,9 @@ namespace Myshipping.Application
             }
         }
         #endregion
+      
+
+
 
         #region 放舱(入货通知)
 
diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
index 052c40fc..337559a6 100644
--- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs
+++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs
@@ -109,13 +109,10 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     /// 获取船公司列表信息
     /// </summary>
     [HttpGet("/commondb/carrierlist")]
-    public async Task<dynamic> CarrierList([FromQuery] CodeCnEnQueryDto input)
+    public async Task<dynamic> CarrierList([FromQuery] NameQueryDto input)
     {
         var list = await _sysCacheService.GetAllCodeCarrier();
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.CnName), x => x.CnName.Contains(input.CnName, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.EnName), x => x.EnName.Contains(input.EnName, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        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();
     }
@@ -154,9 +151,6 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
             throw Oops.Bah("请传入模块查询");
         }
         var queryList = list.Where(x => x.Module == input.Module)
-            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
              .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();
@@ -203,12 +197,11 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeVessel> list = await _sysCacheService.GetAllCodeVessel();
         //数量太多，不允许查询全部
-        if (string.IsNullOrEmpty(input.Name)|| string.IsNullOrEmpty(input.KeyWord))
+        if (string.IsNullOrEmpty(input.KeyWord))
         {
            return  list.Take(10);
         }
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
             || x.EdiCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
         return queryList.ToList();
     }
@@ -248,7 +241,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         List<MappingVessel> list = await _sysCacheService.GetAllMappingVessel();
 
         var queryList = list.Where(x => x.Module == input.Module)
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
+            
           .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();
@@ -299,8 +292,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeForwarder> list = await _sysCacheService.GetAllCodeForwarder();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
+        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();
     }
@@ -336,8 +328,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeYard> list = await _sysCacheService.GetAllCodeYard();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-               .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
+        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();
     }
@@ -377,10 +368,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         List<MappingYard> list = await _sysCacheService.GetAllMappingYard();
 
         var queryList = list.Where(x => x.Module == input.Module)
-            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
-               .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+            .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();
@@ -430,8 +418,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodePortLoad> list = await _sysCacheService.GetAllCodePortLoad();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name) || x.EnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-               .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
              || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EdiCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
@@ -473,9 +460,6 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         List<MappingPortLoad> list = await _sysCacheService.GetAllMappingPortLoad();
 
         var queryList = list.Where(x => x.Module == input.Module)
-             .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
          .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));
 
@@ -523,12 +507,11 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     public async Task<dynamic> PortList([FromQuery] NameQueryDto input)
     {
         List<CodePort> list = await _sysCacheService.GetAllCodePort();
-        if (string.IsNullOrWhiteSpace(input.KeyWord)||string.IsNullOrWhiteSpace(input.Name)) {
+        if (string.IsNullOrWhiteSpace(input.KeyWord)) {
 
             return list.Take(10);
         }
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name) || x.EnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-                .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
              || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EdiCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
@@ -570,10 +553,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         List<MappingPort> list = await _sysCacheService.GetAllMappingPort();
 
         var queryList = list.Where(x => x.Module == input.Module)
-            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
-              .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+            .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));
 
 
@@ -620,8 +600,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodePackage> list = await _sysCacheService.GetAllCodePackage();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        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();
@@ -660,9 +639,6 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         List<MappingPackage> list = await _sysCacheService.GetAllMappingPackage();
 
         var queryList = list.Where(x => x.Module == input.Module)
-           .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
               .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));
 
@@ -709,8 +685,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeService> list = await _sysCacheService.GetAllCodeService();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-                .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        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));
 
 
@@ -752,10 +727,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         List<MappingService> list = await _sysCacheService.GetAllMappingService();
 
         var queryList = list.Where(x => x.Module == input.Module)
-            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
-              .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+            .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));
 
 
@@ -802,8 +774,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeCtn> list = await _sysCacheService.GetAllCodeCtn();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-                .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Name.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        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));
 
 
@@ -872,10 +843,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         var list = await _sysCacheService.GetAllMappingCtn();
 
         var queryList = list.Where(x => x.Module == input.Module)
-            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
-               .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+            .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));
 
 
@@ -924,8 +892,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeFrt> list = await _sysCacheService.GetAllCodeFrt();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name) || x.EnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-                  .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
             || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
@@ -967,9 +934,6 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         var list = await _sysCacheService.GetAllMappingFrt();
 
         var queryList = list.Where(x => x.Module == input.Module)
-            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
-            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase))
             .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();
@@ -1013,8 +977,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeIssueType> list = await _sysCacheService.GetAllCodeIssueType();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-                  .WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
             || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase));
 
 
@@ -1118,8 +1081,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeLane> list = await _sysCacheService.GetAllCodeLane();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-                  .WhereIF(!string.IsNullOrEmpty(input.KeyWord), 
+        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord), 
                   x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) 
                   || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
                   || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
@@ -1259,8 +1221,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     {
         List<CodeCountry> list = await _sysCacheService.GetAllCodeCountry();
 
-        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase))
-                  .WhereIF(!string.IsNullOrEmpty(input.KeyWord),
+        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.KeyWord),
                   x => x.Code.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
                   || x.EnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
                   || x.CnName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
diff --git a/Myshipping.Core/Service/CommonDB/Dto/QueryDto.cs b/Myshipping.Core/Service/CommonDB/Dto/QueryDto.cs
index 4694d619..aedd85d5 100644
--- a/Myshipping.Core/Service/CommonDB/Dto/QueryDto.cs
+++ b/Myshipping.Core/Service/CommonDB/Dto/QueryDto.cs
@@ -6,22 +6,13 @@ using System.Threading.Tasks;
 
 namespace Myshipping.Core.Service
 {
-    //代码、中文、英文名查询
-    public class CodeCnEnQueryDto
-    {
-        public string Code { get; set; }
-        public string CnName { get; set; }
-        public string EnName { get; set; }
-        /// <summary>
-        /// 关键字
-        /// </summary>
-        public string KeyWord { get; set; }
-    }
 
-    //Name查询 
+
+
+    //KeyWord 
     public class NameQueryDto
     {
-        public string Name { get; set; }
+ 
         /// <summary>
         /// 关键字
         /// </summary>
@@ -30,22 +21,13 @@ namespace Myshipping.Core.Service
 
     public class MappingQueryDto
     {
-        public string Code { get; set; }
+       
 
         /// <summary>
         /// 模块
         /// </summary>
         public string Module { get; set; }
-
-        /// <summary>
-        /// 映射代码
-        /// </summary>
-        public string MapCode { get; set; }
-
-        /// <summary>
-        /// 映射名称
-        /// </summary>
-        public string MapName { get; set; }
+ 
         /// <summary>
         /// 关键字
         /// </summary>