修改任务增加BC附件类型

Myshipping.Application/Entity/TaskManagePlat/TaskFileInfo.cs

@@ -28,5 +28,15 @@ namespace Myshipping.Application.Entity
         /// 文件名
         /// </summary>
         public string FILE_NAME { get; set; }
+
+        /// <summary>
+        /// 附件类型代码 BC-Booking Confirmation
+        /// </summary>
+        public string FILE_CATEGORY { get; set; }
+
+        /// <summary>
+        /// 附件类型名称 BC-Booking Confirmation
+        /// </summary>
+        public string FILE_CATEGORY_NAME { get; set; }
     }
 }

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -305,6 +305,12 @@ namespace Myshipping.Application
                         fileInfo.FILE_NAME = file.FileName;
                         fileInfo.FILE_TYPE = file.FileType;
 
+                        if (TaskBaseTypeEnum.BC.ToString() == taskInfo.TASK_BASE_TYPE)
+                        {
+                            fileInfo.FILE_CATEGORY = TaskFileCategoryEnum.BC.ToString();
+                            fileInfo.FILE_CATEGORY_NAME = TaskFileCategoryEnum.BC.GetDescription();
+                        }
+
                         if (string.IsNullOrWhiteSpace(fileInfo.FILE_NAME))
                         {
                             var fileModel = new FileInfo(file.FilePath);
@@ -936,17 +942,17 @@ namespace Myshipping.Application
             var entities = await _taskBaseInfoRepository.AsQueryable()
                                      .Where(t=> userlist == null || userlist.Contains(t.CreatedUserId))
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.MBlNo), t => mblList.Contains(t.MBL_NO))
-                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskRecvName), t => t.CreatedUserName.Contains(QuerySearch.TaskRecvName.Trim(), StringComparison.OrdinalIgnoreCase))
+                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskRecvName), t => t.CreatedUserName.Contains(QuerySearch.TaskRecvName.Trim()))
                                      .WhereIF(etdBegin != DateTime.MinValue, t => t.ETD.HasValue && t.ETD.Value >= etdBegin)
                                      .WhereIF(etdEnd != DateTime.MinValue, t => t.ETD.HasValue && t.ETD.Value < etdEnd)
                                      .WhereIF(taskDateBegin != DateTime.MinValue, t => t.CreatedTime >= taskDateBegin)
                                      .WhereIF(taskDateEnd != DateTime.MinValue, t => t.CreatedTime < taskDateEnd)
-                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskType), t => t.TASK_TYPE.Equals(QuerySearch.TaskType, StringComparison.OrdinalIgnoreCase))
-                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskSource), t => t.TASK_SOURCE.Equals(QuerySearch.TaskSource, StringComparison.OrdinalIgnoreCase))
+                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskType), t => t.TASK_TYPE.Equals(QuerySearch.TaskType))
+                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskSource), t => t.TASK_SOURCE.Equals(QuerySearch.TaskSource))
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskCategory) && QuerySearch.TaskCategory == TaskStatLevelEnum.EXCPTION.ToString(), t => t.IS_EXCEPT == 1)
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskCategory) && QuerySearch.TaskCategory == TaskStatLevelEnum.PUBLIC.ToString(), t => t.IS_PUBLIC == 1)
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.TaskCategory) && QuerySearch.TaskCategory == TaskStatLevelEnum.PERSON.ToString(), t => t.IS_PUBLIC == 0 && t.IS_EXCEPT == 0)
-                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.Status), t => t.STATUS.Equals(QuerySearch.Status, StringComparison.OrdinalIgnoreCase))
+                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.Status), t => t.STATUS.Equals(QuerySearch.Status))
                                      .OrderBy(entityOrderCol + (QuerySearch.descSort ? " desc " : " asc "))
                                      .ToPagedListAsync(QuerySearch.PageNo, QuerySearch.PageSize);