From a2448a582f2baeabf32c4f8dd8ab447feb2538e6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 10:25:21 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs |   60 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
index 22406bb..7e797c8 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
@@ -10,6 +10,7 @@
 using System.Reflection;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
+using CmsQueryExtensions.Entitys;
 
 namespace CMS.Plugin.PipeLineLems.Controller
 {
@@ -40,7 +41,7 @@
         /// <summary> 
         /// 鑾峰彇浣滀笟璁″垝琛� 
         /// </summary> 
-        /// <param name="id">鏍囪瘑绗�.</param> 
+        /// <param name="id">涓婚敭ID</param> 
         /// <returns></returns> 
         [HttpGet]
         [Route("{id}")]
@@ -52,7 +53,7 @@
         /// <summary> 
         /// 鍒嗛〉鑾峰彇浣滀笟璁″垝琛ㄧ殑鍒楄〃. 
         /// </summary> 
-        /// <param name="input">杈撳叆.</param> 
+        /// <param name="input">鏌ヨ鍙傛暟</param> 
         /// <returns></returns> 
         [HttpGet]
         [Route("Page")]
@@ -64,71 +65,88 @@
         /// <summary> 
         /// 鍒涘缓浣滀笟璁″垝琛� 
         /// </summary> 
-        /// <param name="input">杈撳叆.</param> 
+        /// <param name="input">鍒涘缓鍙傛暟</param> 
         /// <returns></returns> 
-        //[Authorize] 
+        [Authorize]
         [HttpPost]
         public virtual Task<WorkPlanDto> CreateAsync(WorkPlanCreateDto input)
         {
+            input.CreatorName = _currentUser.UserAccount;//鍒涘缓浜� 
             return _workPlanAppService.CreateAsync(input);
         }
 
         /// <summary> 
         /// 鏇存柊浣滀笟璁″垝琛� 
         /// </summary> 
-        /// <param name="id">鏍囪瘑绗�.</param> 
-        /// <param name="input">杈撳叆.</param> 
+        /// <param name="id">涓婚敭ID</param> 
+        /// <param name="input">鏇存柊鍙傛暟</param> 
         /// <returns></returns> 
-        //[Authorize] 
+        [Authorize]
         [HttpPut]
         [Route("{id}")]
         public virtual Task<WorkPlanDto> UpdateAsync(Guid id, WorkPlanUpdateDto input)
         {
+            input.LastModifierName = _currentUser.UserAccount;//淇敼浜� 
             return _workPlanAppService.UpdateAsync(id, input);
         }
 
         /// <summary> 
         /// 鍏嬮殕浣滀笟璁″垝琛� 
         /// </summary> 
-        /// <param name="ids">Id闆嗗悎.</param> 
+        /// <param name="ids">Id闆嗗悎</param> 
         /// <returns></returns> 
-        //[Authorize] 
+        [Authorize]
         [HttpPost]
         [Route("Clone")]
         public virtual Task<List<WorkPlanDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
         {
+            MyCurrentUser myCurrentUser = new MyCurrentUser()
+            {
+                UserAccount = _currentUser.UserAccount,
+                UserId = _currentUser.UserId
+            };
             return _workPlanAppService.CloneAsync(ids);
         }
 
         /// <summary> 
         /// 鍒犻櫎浣滀笟璁″垝琛� 
         /// </summary> 
-        /// <param name="id">鏍囪瘑绗�.</param> 
+        /// <param name="id">涓婚敭ID</param> 
         /// <returns></returns> 
-        //[Authorize] 
+        [Authorize]
         [HttpDelete]
         [Route("{id}")]
         public virtual Task DeleteAsync(Guid id)
         {
-            return _workPlanAppService.DeleteAsync(id);
+            MyCurrentUser myCurrentUser = new MyCurrentUser()
+            {
+                UserAccount = _currentUser.UserAccount,
+                UserId = _currentUser.UserId
+            };
+            return _workPlanAppService.DeleteAsync(id);//閫昏緫鍒犻櫎 
         }
 
         /// <summary> 
         /// 鎵归噺鍒犻櫎浣滀笟璁″垝琛� 
         /// </summary> 
-        /// <param name="ids">The ids.</param> 
+        /// <param name="ids">涓婚敭ID闆嗗悎</param> 
         /// <returns></returns> 
-        //[Authorize] 
+        [Authorize]
         [HttpDelete]
         public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
         {
-            return _workPlanAppService.DeleteManyAsync(ids);
+            MyCurrentUser myCurrentUser = new MyCurrentUser()
+            {
+                UserAccount = _currentUser.UserAccount,
+                UserId = _currentUser.UserId
+            };
+            return _workPlanAppService.DeleteManyAsync(ids);//閫昏緫鍒犻櫎 
         }
 
         /// <summary> 
         /// 璋冩暣鎺掑簭浣滀笟璁″垝琛� 
         /// </summary> 
-        /// <param name="id">鏍囪瘑绗�.</param> 
+        /// <param name="id">涓婚敭ID</param> 
         /// <returns></returns> 
         [HttpPut]
         [Route("{id}/AdjustSort/{sort}")]
@@ -150,9 +168,6 @@
             await file.CopyToAsync(stream);
             stream.Seek(0L, SeekOrigin.Begin);
 
-            var userAccount = _currentUser.UserAccount;
-            var userId = _currentUser.UserId;
-
             var sheetNames = stream.GetSheetNames();
             var workPlanRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WorkPlansImportModel.WorkPlanImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
 
@@ -161,10 +176,15 @@
                 throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
             }
 
+            MyCurrentUser myCurrentUser = new MyCurrentUser()
+            {
+                UserAccount = _currentUser.UserAccount,
+                UserId = _currentUser.UserId
+            };
             await _workPlanAppService.ImportAsync(new WorkPlansImportModel
             {
                 WorkPlans = workPlanRows,
-            }, userId, userAccount);
+            }, myCurrentUser);
 
             return Ok();
         }

--
Gitblit v1.9.3