From 05c47e0a832bbd2b8bafb732fc55c1ef8e9b97e0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 21 5月 2025 11:41:47 +0800
Subject: [PATCH] 22
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs | 86 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 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..ade69da 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
@@ -10,6 +10,9 @@
using System.Reflection;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
+using CmsQueryExtensions.Entitys;
+using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
+using System.Linq.Expressions;
namespace CMS.Plugin.PipeLineLems.Controller
{
@@ -40,7 +43,7 @@
/// <summary>
/// 鑾峰彇浣滀笟璁″垝琛�
/// </summary>
- /// <param name="id">鏍囪瘑绗�.</param>
+ /// <param name="id">涓婚敭ID</param>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
@@ -52,7 +55,7 @@
/// <summary>
/// 鍒嗛〉鑾峰彇浣滀笟璁″垝琛ㄧ殑鍒楄〃.
/// </summary>
- /// <param name="input">杈撳叆.</param>
+ /// <param name="input">鏌ヨ鍙傛暟</param>
/// <returns></returns>
[HttpGet]
[Route("Page")]
@@ -62,73 +65,114 @@
}
/// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇浣滀笟璁″垝琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("FindListByFilter")]
+ public virtual async Task<List<WorkPlanDto>> FindListByFilterAsync([FromBody]GetWorkPlanInput input)
+ {
+ return await _workPlanAppService.FindListByFilterAsync(input);
+ }
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜浣滀笟璁″垝琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("FindSingleByFilter")]
+ public virtual async Task<WorkPlanDto> FindSingleByFilterAsync([FromBody] GetWorkPlanInput input)
+ {
+
+ return await _workPlanAppService.FindSingleByFilterAsync(input);
+ }
+
+ /// <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 +194,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 +202,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