diff --git a/Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowBaseService.cs b/Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowBaseService.cs
index a37b1558..7b2c0626 100644
--- a/Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowBaseService.cs
+++ b/Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowBaseService.cs
@@ -105,5 +105,13 @@ namespace Myshipping.Application
/// 服务活动主键数组
/// 返回回执
Task GetServiceWorkFlowListByActivities(string[] activitiesArgs);
+
+ ///
+ /// 检索服务流程活动列表
+ ///
+ /// 检索值
+ /// 最大返回行数(默认15)
+ /// 返回回执
+ Task QueryActivitiesList(string queryItem, int topNum = 15);
}
}
diff --git a/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs b/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs
index 62ba8ed2..9c14cf4f 100644
--- a/Myshipping.Application/Service/TrackingSystem/ServiceProjectService.cs
+++ b/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;
diff --git a/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs b/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs
index c68f4372..4c7bb8c0 100644
--- a/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs
+++ b/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs
@@ -1483,5 +1483,37 @@ namespace Myshipping.Application
return result;
}
#endregion
+
+ #region 检索服务流程活动列表
+ ///
+ /// 检索服务流程活动列表
+ ///
+ /// 检索值
+ /// 最大返回行数(默认15)
+ /// 返回回执
+ [HttpGet("/ServiceWorkFlowBase/QueryActivitiesList")]
+ public async Task 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>();
+
+ }
+ catch (Exception ex)
+ {
+ result.succ = false;
+ result.msg = $"检索服务流程活动列表异常,原因:{ex.Message}";
+ }
+
+ return result;
+ }
+ #endregion
}
}