From 978ecbc688c7e457e0fa2015b407668b48d1dcda Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing123>
Date: Wed, 31 May 2023 11:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0BC=E9=99=84=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entity/TaskManagePlat/TaskFileInfo.cs          | 10 ++++++++++
 .../Service/TaskManagePlat/TaskManageService.cs    | 14 ++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Myshipping.Application/Entity/TaskManagePlat/TaskFileInfo.cs b/Myshipping.Application/Entity/TaskManagePlat/TaskFileInfo.cs
index 2d8ed1ed..a8b7fad4 100644
--- a/Myshipping.Application/Entity/TaskManagePlat/TaskFileInfo.cs
+++ b/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; }
     }
 }
diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
index c0ba6e9a..57c28e05 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
+++ b/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);