From b139734d57cd76bc974841ce53700ba02530c501 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Thu, 29 Feb 2024 19:06:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=97=B6=EF=BC=8C=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7id=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoMapper/OrderAutoMapperProfile.cs | 5 +++ .../ProvideServices/GetPageTrackOrderInput.cs | 2 +- .../SJZY.Track.Application.csproj | 2 -- .../Services/ProvideServices/OrderService.cs | 4 ++- .../Dtos/Order/GetPageTrackOrderInputVO.cs | 36 ++++++++++++++++++- .../SJZY.Track.Domain.csproj | 1 + src/SJZY.Track.Repository/DataBaseContext.cs | 24 +++++++++++++ src/SJZY.Track.Repository/OrderRepository.cs | 11 +++++- .../SJZYTrackRepositoryModule.cs | 4 +++ 9 files changed, 83 insertions(+), 6 deletions(-) diff --git a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs index 2dac9751..4a0bb612 100644 --- a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs @@ -1,6 +1,8 @@ using AutoMapper; +using AutoMapper.Internal.Mappers; using SJZY.Track.Application.Dtos.ProvideServices; using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Dtos.Order; namespace SJZY.Track.Application.AutoMapper; @@ -15,5 +17,8 @@ public class OrderAutoMapperProfile : Profile .ForMember(dest => dest.ServiceProviderId, opt => opt.MapFrom(m => m.ServiceProviderId ?? 0)) .ForMember(dest => dest.TrackTemplateId, opt => opt.MapFrom(m => m.TemplateId)); CreateMap(MemberList.None); + + CreateMap(MemberList.None); + } } \ No newline at end of file diff --git a/src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs index e2fb21f2..4709c862 100644 --- a/src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -16,7 +16,7 @@ namespace SJZY.Track.Application.Dtos.ProvideServices /// /// 单号 /// - public List OrderNos { get; set; } + public List? OrderNos { get; set; } /// /// 创建时间开始 diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj index e8f1425c..43edd929 100644 --- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj +++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj @@ -19,8 +19,6 @@ - - diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index 55560ce6..1c5c25dd 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -1,5 +1,6 @@ using SJZY.Track.Application.Dtos.ProvideServices; using SJZY.Track.Domain.Aggregates.OrderAggregate; +using SJZY.Track.Domain.Dtos.Order; namespace SJZY.Track.Application.Services.ProvideServices; @@ -86,7 +87,8 @@ public class OrderService : ApplicationService [HttpPost("/Order/GetTrackOrderList")] public async Task> GetPageTrackOrder(GetPageTrackOrderInput input) { - + var vo = ObjectMapper.Map(input); + var jj = await _orderRepository.GetPageTrackOrder(vo); return null; } diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs index 882f2db8..5dcbafaf 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs @@ -6,9 +6,27 @@ using System.Threading.Tasks; namespace SJZY.Track.Domain.Dtos.Order { - public class GetPageTrackOrderInputVO + public class GetPageTrackOrderInputVO : PageInfoInput { + /// + /// 子系统id + /// + public int SubSystemId { get; set; } + /// + /// 单号 + /// + public List OrderNos { get; set; } + + /// + /// 创建时间开始 + /// + public DateTime? CreateTimeStart { get; set; } + + /// + /// 创建时间截止 + /// + public DateTime? createTimeEnd { get; set; } } /// @@ -16,6 +34,22 @@ namespace SJZY.Track.Domain.Dtos.Order /// public class TrackOrderVO { + /// + /// 轨迹订单id + /// + public int Id { get; set; } + /// + /// 订单类型 + /// + public string OrderType { get; set; } + + + public string OrderNumber { get; set; } + + /// + /// 轨迹模版 + /// + public string TrackTemplateNames { get; set; } } } diff --git a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj index aac0e12d..5ebeded5 100644 --- a/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj +++ b/src/SJZY.Track.Domain/SJZY.Track.Domain.csproj @@ -9,6 +9,7 @@ + diff --git a/src/SJZY.Track.Repository/DataBaseContext.cs b/src/SJZY.Track.Repository/DataBaseContext.cs index b9712ab1..14dbada8 100644 --- a/src/SJZY.Track.Repository/DataBaseContext.cs +++ b/src/SJZY.Track.Repository/DataBaseContext.cs @@ -1,4 +1,6 @@ #pragma warning disable 1591 +using SJZY.UserCenter.HttpApi.Services; + namespace SJZY.Track.Repository { /// @@ -22,6 +24,17 @@ namespace SJZY.Track.Repository entityInfo.SetValue(DateTime.Now); if (entityInfo.PropertyName == nameof(ICreateBaicEntity.CreateUserId)) { + if (oldValue == null || (int)oldValue == 0) + { + try + { + entityInfo.SetValue(CurrentUserRequest.CurrentUser?.UserId); + } + catch + { + + } + } //entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId); } } @@ -32,6 +45,17 @@ namespace SJZY.Track.Repository entityInfo.SetValue(DateTime.Now); else if (entityInfo.PropertyName == nameof(IUpdateBasicEntity.UpdateUserId)) { + if (oldValue == null || (int)oldValue == 1) + { + try + { + entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId); + } + catch + { + + } + } //entityInfo.SetValue(CurrentUserRequest.CurrentUser.UserId); } //删除 diff --git a/src/SJZY.Track.Repository/OrderRepository.cs b/src/SJZY.Track.Repository/OrderRepository.cs index 3fbb9dfb..98a60b5f 100644 --- a/src/SJZY.Track.Repository/OrderRepository.cs +++ b/src/SJZY.Track.Repository/OrderRepository.cs @@ -81,7 +81,16 @@ public class OrderRepository : BasicRepository, IOrderRepository, I public async Task> GetPageTrackOrder(GetPageTrackOrderInputVO input) { //await Context.Queryable((a,b)= ); - //await Context.Queryable((a,b)=> ) + await Context.Queryable((a, b) => new JoinQueryInfos(JoinType.Left, a.Id==b.OrderId)) + .GroupBy((a, b) => new { a.Id }) + .Select((a, b) => new TrackOrderVO + { + Id=a.Id, + OrderNumber=a.OrderNo, + + + + }).ToPageListAsync(input.PageIndex, input.PageSize); return null; } diff --git a/src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs b/src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs index b58d19b1..a482fb7f 100644 --- a/src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs +++ b/src/SJZY.Track.Repository/SJZYTrackRepositoryModule.cs @@ -43,6 +43,10 @@ public class SJZYTrackRepositoryModule : AbpModule }); } + + + + public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddTransient(typeof(IBasicQuery<>), typeof(BasicQuery<>));