From 4b3fd35893972bb05fd7ab89dc624ab805093ff3 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周日, 18 5月 2025 19:47:46 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/IWorkPlanAppService.cs |   77 ++++++++++++++++++++++++++++++--------
 1 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/IWorkPlanAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/IWorkPlanAppService.cs
index ce9762c..4e92385 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/IWorkPlanAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application.Contracts/Services/IWorkPlanAppService.cs
@@ -1,46 +1,89 @@
-using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan; 
-using Volo.Abp.Application.Services; 
- 
-namespace CMS.Plugin.PipeLineLems.Application.Contracts.Services; 
- 
+using Ao.Stock.Mirror;
+using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
+using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
+using CmsQueryExtensions.Entitys;
+using System.Linq.Expressions;
+using Volo.Abp;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Users;
+
+namespace CMS.Plugin.PipeLineLems.Application.Contracts.Services;
+
 /// <summary> 
 /// 浣滀笟璁″垝琛ㄥ簲鐢ㄦ湇鍔℃帴鍙� 
 /// </summary> 
-public interface IWorkPlanAppService : ICrudAppService<WorkPlanDto, Guid, GetWorkPlanInput, WorkPlanCreateDto, WorkPlanUpdateDto> 
-{ 
+public interface IWorkPlanAppService : ICrudAppService<WorkPlanDto, Guid, GetWorkPlanInput, WorkPlanCreateDto, WorkPlanUpdateDto>
+{
     /// <summary> 
     /// 鍏嬮殕浣滀笟璁″垝琛� 
     /// </summary> 
     /// <param name="ids"></param> 
     /// <returns></returns> 
-    Task<List<WorkPlanDto>> CloneAsync(IEnumerable<Guid> ids); 
- 
+    Task<List<WorkPlanDto>> CloneAsync(IEnumerable<Guid> ids);
+
+
+
     /// <summary> 
     /// 鍒犻櫎浣滀笟璁″垝琛� 
     /// </summary> 
     /// <param name="ids"></param> 
     /// <returns></returns> 
-    Task DeleteManyAsync(IEnumerable<Guid> ids); 
- 
+    Task DeleteManyAsync(IEnumerable<Guid> ids);
+
     /// <summary> 
     /// 璋冩暣鎺掑簭浣滀笟璁″垝琛� 
     /// </summary> 
     /// <param name="id"></param> 
     /// <param name="sort"></param> 
     /// <returns></returns> 
-    Task AdjustSortAsync(Guid id, int sort); 
- 
+    Task AdjustSortAsync(Guid id, int sort);
+
     /// <summary> 
     /// 瀵煎叆浣滀笟璁″垝琛� 
     /// </summary> 
     /// <param name="input"></param> 
     /// <returns></returns> 
-    Task ImportAsync(WorkPlansImportModel input); 
- 
+    Task ImportAsync(WorkPlansImportModel input, MyCurrentUser myCurrentUser);
+
     /// <summary> 
     /// 瀵煎嚭浣滀笟璁″垝琛� 
     /// </summary> 
     /// <param name="input"></param> 
     /// <returns></returns> 
-    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWorkPlanInput input); 
-} 
+    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWorkPlanInput input);
+
+    /// <summary> 
+    /// 鏍规嵁鏉′欢鑾峰彇浣滀笟璁″垝琛ㄥ垪琛� 
+    /// </summary> 
+    /// <param name="whereConditions"></param> 
+    /// <param name="cancellationToken"></param> 
+    /// <returns></returns> 
+    Task<List<WorkPlan>> GetListByFilterAsync(Expression<Func<WorkPlan, bool>> whereConditions, CancellationToken cancellationToken = default);
+
+
+    /// <summary> 
+    ///  鏍规嵁鏉′欢鑾峰彇鍗曚釜浣滀笟璁″垝琛� 
+    /// </summary> 
+    /// <param name="whereConditions"></param> 
+    /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param> 
+    /// <param name="cancellationToken"></param> 
+    /// <returns></returns> 
+    /// <exception cref="UserFriendlyException"></exception> 
+    Task<WorkPlan> GetSingleByFilterAsync(Expression<Func<WorkPlan, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default);
+
+
+    /// <summary> 
+    /// 鏍规嵁鏉′欢鑾峰彇浣滀笟璁″垝琛ㄥ垪琛�
+    /// </summary> 
+    /// <param name="input"></param> 
+    /// <returns></returns> 
+    Task<List<WorkPlanDto>> FindListByFilterAsync(GetWorkPlanInput input, CancellationToken cancellationToken = default);
+    
+    /// <summary> 
+    /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜浣滀笟璁″垝琛�
+    /// </summary> 
+    /// <param name="input"></param> 
+    /// <returns></returns> 
+    Task<WorkPlanDto> FindSingleByFilterAsync(GetWorkPlanInput input, CancellationToken cancellationToken = default);
+    
+}

--
Gitblit v1.9.3