Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Entity/BookingOrder.cs

@@ -954,5 +954,10 @@ namespace Myshipping.Application.Entity
         public DateTime? ATA { get; set; }
 
         #endregion
+
+        /// <summary>
+        /// 申请箱使
+        /// </summary>
+        public string ShenQingXiangShi { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs

@@ -783,5 +783,10 @@ namespace Myshipping.Application
         public DateTime? ATA { get; set; }
 
         #endregion
+
+        /// <summary>
+        /// 申请箱使
+        /// </summary>
+        public string ShenQingXiangShi { get; set; }
     }
 }

Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs

@@ -268,5 +268,12 @@ namespace Myshipping.Application
         /// <param name="model">请求LARA纸详情</param>
         /// <returns>返回结果</returns>
         Task<List<LaraPaperRegistPostDto>> CalcLaraPageNumbers(CalcLaraPageNumbersDto model);
+
+        /// <summary>
+        /// 获取任务列表
+        /// </summary>
+        /// <param name="queryTaskManageDto">查询条件</param>
+        /// <returns>返回结果</returns>
+        //Task<List<TaskBaseInfoDto>> GetTaskList(QueryTaskManageDto queryTaskManageDto);
     }
 }

Myshipping.Core/Service/CommomDBPage/CommonDBPageService.cs

@@ -351,7 +351,11 @@ public class CommonDBPageService : IDynamicApiController, ITransient
          
        return await _mappingCtnRep.AsQueryable().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)).OrderBy(PageInputOrder.OrderBuilder(input.SortField, input.DescSort)).ToPagedListAsync(input.PageNo, input.PageSize);
+             || x.MapCode.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase) 
+             || x.MapName.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase)
+             || x.Remark.Contains(input.KeyWord, System.StringComparison.CurrentCultureIgnoreCase))
+            
+            .OrderBy(PageInputOrder.OrderBuilder(input.SortField, input.DescSort)).ToPagedListAsync(input.PageNo, input.PageSize);
 
     }