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.Application/Implements/WorkPlanAppService.cs | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
index bc1a9cd..ce8adc5 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
@@ -10,6 +10,8 @@
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using Volo.Abp.ObjectMapping;
+using Volo.Abp.Users;
+using CmsQueryExtensions.Entitys;
namespace CMS.Plugin.PipeLineLems.Application.Implements;
@@ -18,16 +20,16 @@
/// </summary>
public class WorkPlanAppService : CMSPluginAppService, IWorkPlanAppService
{
- private readonly IWorkPlanRepository workPlanRepository;
+ private readonly IWorkPlanRepository _workPlanRepository;
private readonly SharedService _sharedService;
private readonly IServiceProvider _serviceProvider;
/// <summary>
/// Initializes a new instance of the <see cref="WorkPlanAppService"/> class.
/// </summary>
/// <param name="WorkPlanRepository">The task job repository.</param>
- public WorkPlanAppService(IWorkPlanRepository _WorkPlanRepository, SharedService sharedService, IServiceProvider serviceProvider)
+ public WorkPlanAppService(IWorkPlanRepository workPlanRepository, SharedService sharedService, IServiceProvider serviceProvider)
{
- workPlanRepository = _WorkPlanRepository;
+ _workPlanRepository = workPlanRepository;
_sharedService = sharedService;
_serviceProvider = serviceProvider;
}
@@ -39,8 +41,9 @@
/// <returns></returns>
public virtual async Task<WorkPlanDto> GetAsync(Guid id)
{
- return ObjectMapper.Map<WorkPlan, WorkPlanDto>(await workPlanRepository.GetAsync(id));
+ return ObjectMapper.Map<WorkPlan, WorkPlanDto>(await _workPlanRepository.GetAsync(id));
}
+
/// <summary>
/// 鍒嗛〉鑾峰彇浣滀笟璁″垝琛�
@@ -63,8 +66,8 @@
#endregion
- var count = await workPlanRepository.GetCountAsync(whereConditions);
- var list = await workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
+ var count = await _workPlanRepository.GetCountAsync(whereConditions);
+ var list = await _workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);
return new PagedResultDto<WorkPlanDto>(count, ObjectMapper.Map<List<WorkPlan>, List<WorkPlanDto>>(list));
}
@@ -102,20 +105,21 @@
{
await CheckCreateOrUpdateDtoAsync(input);
- var exist = await workPlanRepository.NameExistAsync(input.TaskCode);
+ var exist = await _workPlanRepository.NameExistAsync(input.TaskCode);
if (exist)
{
throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskCode]);
}
- var maxSort = await workPlanRepository.GetMaxSortAsync();
+ var maxSort = await _workPlanRepository.GetMaxSortAsync();
var sort = input.Sort ?? maxSort;
var insertObj = ObjectMapper.Map<WorkPlanCreateDto, WorkPlan>(input);
insertObj.Sort = sort;
+ insertObj.CreatorName = "SuperAdmin";
input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
- await workPlanRepository.InsertAsync(insertObj);
+ await _workPlanRepository.InsertAsync(insertObj);
//if (input.Sort.HasValue && insertObj.Sort != maxSort)
//{
@@ -136,8 +140,8 @@
{
await CheckCreateOrUpdateDtoAsync(input);
- var updateObj = await workPlanRepository.GetAsync(id);
- var exist = await workPlanRepository.NameExistAsync(input.TaskCode, updateObj.Id);
+ var updateObj = await _workPlanRepository.GetAsync(id);
+ var exist = await _workPlanRepository.NameExistAsync(input.TaskCode, updateObj.Id);
if (exist)
{
throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.TaskCode]);
@@ -166,7 +170,7 @@
updateObj.ProductCode = input.ProductCode;
updateObj.WorkstationCode = input.WorkstationCode;
updateObj.EquipmentCode = input.EquipmentCode;
- updateObj.WorkpieceName = input.WorkpieceName;
+
updateObj.ProcessName = input.ProcessName;
updateObj.PipeFittingCode = input.PipeFittingCode;
updateObj.PreSerialNumber = input.PreSerialNumber;
@@ -183,7 +187,7 @@
updateObj.Remark = input.Remark;
- await workPlanRepository.UpdateAsync(updateObj);
+ await _workPlanRepository.UpdateAsync(updateObj);
return ObjectMapper.Map<WorkPlan, WorkPlanDto>(updateObj);
}
@@ -235,7 +239,7 @@
/// <returns></returns>
public virtual Task DeleteAsync(Guid id)
{
- return workPlanRepository.DeleteAsync(id);
+ return _workPlanRepository.DeleteAsync(id);
}
/// <summary>
@@ -259,7 +263,7 @@
/// <returns></returns>
public virtual async Task AdjustSortAsync(Guid id, int sort)
{
- var list = await workPlanRepository.GetListAsync(null, nameof(WorkPlan.Sort));
+ var list = await _workPlanRepository.GetListAsync(null, nameof(WorkPlan.Sort));
if (list != null && list.Any())
{
var initSort = 1;
@@ -286,7 +290,7 @@
}
}
- await workPlanRepository.UpdateManyAsync(list);
+ await _workPlanRepository.UpdateManyAsync(list);
}
/// <summary>
@@ -295,13 +299,13 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WorkPlansImportModel input)
+ public async Task ImportAsync(WorkPlansImportModel input, MyCurrentUser myCurrentUser)
{
//杞崲鏁版嵁
var result = ObjectMapper.Map<List<WorkPlansImportModel.WorkPlanImportModel>, List<WorkPlanInput>>(input.WorkPlans);
//await CreatebyApsAsync(result);
- await _sharedService.CommonCreatebyApsAsync(result, _serviceProvider, this);
+ await _sharedService.CommonCreatebyApsAsync(result, _serviceProvider, this, myCurrentUser.UserId, myCurrentUser.UserAccount);
// Check.NotNull(input, nameof(input));
// var workPlanCreateDtos = new List<(int RowIndex, WorkPlanCreateDto Item)>();
@@ -479,7 +483,7 @@
#endregion
- var list = await workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
+ var list = await _workPlanRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
var result = ObjectMapper.Map<List<WorkPlan>, List<WorkPlanDto>>(list);
var sheets = new Dictionary<string, object>
@@ -515,4 +519,28 @@
return Task.CompletedTask;
}
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇浣滀笟璁″垝琛ㄥ垪琛�
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<WorkPlan>> GetListByFilterAsync(Expression<Func<WorkPlan, bool>> whereConditions, CancellationToken cancellationToken = default)
+ {
+ return await _workPlanRepository.GetListByFilterAsync(whereConditions);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜浣滀笟璁″垝琛�
+ /// </summary>
+ /// <param name="whereConditions"></param>
+ /// <param name="isMultipleThrowException">鏄惁鏌ヨ鍑哄鏉″氨鎶ラ敊</param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ /// <exception cref="UserFriendlyException"></exception>
+ public async Task<WorkPlan> GetSingleByFilterAsync(Expression<Func<WorkPlan, bool>> whereConditions, bool is鈥婱ultipleThrowException = false, CancellationToken cancellationToken = default)
+ {
+ return await _workPlanRepository.GetSingleByFilterAsync(whereConditions, is鈥婱ultipleThrowException);
+ }
}
--
Gitblit v1.9.3