修改服务检索查询

Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowBaseService.cs

@@ -105,5 +105,13 @@ namespace Myshipping.Application
         /// <param name="activitiesArgs">服务活动主键数组</param>
         /// <returns>返回回执</returns>
         Task<TaskManageOrderResultDto> GetServiceWorkFlowListByActivities(string[] activitiesArgs);
+
+        /// <summary>
+        /// 检索服务流程活动列表
+        /// </summary>
+        /// <param name="queryItem">检索值</param>
+        /// <param name="topNum">最大返回行数（默认15）</param>
+        /// <returns>返回回执</returns>
+        Task<TaskManageOrderResultDto> QueryActivitiesList(string queryItem, int topNum = 15);
     }
 }

Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs

@@ -545,7 +545,7 @@ namespace Myshipping.Application
             try
             {
                 var list = await _serviceProjectBaseInfoRepository.AsQueryable().Where(a =>
-                    a.IS_ENABLE == 1 && !a.IsDeleted && (a.SERVICE_PROJECT_CODE.Contains(queryItem) || a.SERVICE_PROJECT_NAME.Contains(queryItem)))
+                    a.IS_ENABLE == 1 && !a.IsDeleted && (string.IsNullOrWhiteSpace(queryItem) || a.SERVICE_PROJECT_CODE.Contains(queryItem) || a.SERVICE_PROJECT_NAME.Contains(queryItem)))
                     .Take(topNum).ToListAsync();
 
                 result.succ = true;

Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs

@@ -1483,5 +1483,37 @@ namespace Myshipping.Application
             return result;
         }
         #endregion
+
+        #region 检索服务流程活动列表
+        /// <summary>
+        /// 检索服务流程活动列表
+        /// </summary>
+        /// <param name="queryItem">检索值</param>
+        /// <param name="topNum">最大返回行数（默认15）</param>
+        /// <returns>返回回执</returns>
+        [HttpGet("/ServiceWorkFlowBase/QueryActivitiesList")]
+        public async Task<TaskManageOrderResultDto> QueryActivitiesList([FromQuery]string queryItem, [FromQuery] int topNum = 15)
+        {
+            TaskManageOrderResultDto result = new TaskManageOrderResultDto();
+
+            try
+            {
+                var list = await _serviceWorkFlowActivitiesInfoRepository.AsQueryable()
+                    .Where(a => !a.IsDeleted && (string.IsNullOrWhiteSpace(queryItem) || a.SHOW_NAME.Contains(queryItem)))
+                    .Take(topNum).ToListAsync();
+
+                result.succ = true;
+                result.ext = list.Adapt<List<ServiceWorkFlowActivitiesDto>>();
+
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"检索服务流程活动列表异常，原因：{ex.Message}";
+            }
+
+            return result;
+        }
+        #endregion
     }
 }