From 92bb68f854d9895d2c818bfaf5541d331470c233 Mon Sep 17 00:00:00 2001 From: xiaolipro <2357729423@qq.com> Date: Thu, 12 Sep 2024 16:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/ProvideServices/GetPageTrackOrderInput.cs | 10 ---------- .../Dtos/TrackContents/EditTrackContentInput.cs | 2 +- .../Dtos/TrackFlags/GetTrackFlagListDto.cs | 10 +++++----- .../Dtos/TrackStatus/GetTrackStatusDetailDto.cs | 5 +++++ .../Dtos/TrackStatus/GetTrackStatusListDto.cs | 5 +++++ .../Dtos/TrackContents/GetPageTrackContentVO.cs | 5 +++++ .../Dtos/TrackFlags/GetPageTrackFlagVO.cs | 10 +++++----- .../Dtos/TrackFlags/GetTrackFlagDetailVO.cs | 12 ++++++------ .../Dtos/TrackStatus/GetTrackStatusDetailVO.cs | 5 +++++ .../Dtos/TrackStatus/GetTrackStatusListVO.cs | 5 +++++ .../Repositories/TrackContentRepository.cs | 1 + .../Repositories/TrackFlagRepository.cs | 8 ++++---- .../Repositories/TrackStatusRepository.cs | 6 ++++-- 13 files changed, 51 insertions(+), 33 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs index e7933e1b..61d9fb82 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs @@ -73,16 +73,6 @@ public class TrackOrderDto /// public string? OrderNumber { get; set; } - /// - /// 轨迹模版 - /// - public string? TrackTemplateNames { get; set; } - - /// - /// 轨迹模板Id数组 - /// - public List? TrackTemplateIds { get; set; } - /// /// 客户简称 /// diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs index 449aeb0d..f2441a08 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs @@ -98,5 +98,5 @@ public class GetTrackContentDetailDto /// /// 轨迹标记ids /// - public List? TrackFlagIds { get; set; } + public List? TrackFlagIds { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs index 89c82a8e..bc422fbb 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Application.Contract.Dtos.TrackFlags; +namespace SJZY.Track.Application.Contract.Dtos.TrackFlags; public class GetTrackFlagListDto { @@ -22,10 +22,10 @@ public class GetTrackFlagListDto /// public string Flag { get; set; } - ///// - ///// 是否完结 - ///// - //public bool IsFinish { get; set; } + /// + /// 是否广播 + /// + public bool IsToMq { get; set; } /// /// 创建时间 diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs index 876ee1ee..228b013c 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs @@ -46,4 +46,9 @@ public class GetTrackStatusDetailDto /// 是否完结 /// public bool IsCompleted { get; set; } + + /// + /// 是否广播 + /// + public bool IsToMq { get; set; } } diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs index 715e2fbc..e0410ee0 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs @@ -37,6 +37,11 @@ public class GetTrackStatusListDto /// public bool IsCompleted { get; set; } + /// + /// 是否广播 + /// + public bool IsToMq { get; set; } + /// /// 创建人 /// diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs index 37dfc796..5dc044c7 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs @@ -65,6 +65,11 @@ public class GetTrackContentListVO /// public string TrackFlag { get; set; } + /// + /// 是否对外 + /// + public bool IsExternal { get; set; } + /// /// 创建时间 /// diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs index 27a73dbd..230b04f1 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackFlags; +namespace SJZY.Track.Domain.Dtos.TrackFlags; public class GetPageTrackFlagVO : PageInfoInput { @@ -40,10 +40,10 @@ public class GetTrackFlagListVO /// public string Flag { get; set; } - ///// - ///// 是否完结 - ///// - //public bool IsFinish { get; set; } + /// + /// 是否广播 + /// + public bool IsToMq { get; set; } /// /// 创建时间 diff --git a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs index 832dedbc..566ee661 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs @@ -1,4 +1,4 @@ -namespace SJZY.Track.Domain.Dtos.TrackFlags; +namespace SJZY.Track.Domain.Dtos.TrackFlags; public class GetTrackFlagDetailVO { @@ -23,12 +23,12 @@ public class GetTrackFlagDetailVO public string Code { get; set; } /// - /// + /// /// public string Flag { get; set; } - ///// - ///// 是否完结 - ///// - //public bool IsFinish { get; set; } + /// + /// 是否广播 + /// + public bool IsToMq { get; set; } } diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs index 15048143..c72d5e64 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs @@ -46,4 +46,9 @@ public class GetTrackStatusDetailVO /// 是否完结 /// public bool IsCompleted { get; set; } + + /// + /// 是否广播 + /// + public bool IsToMq { get; set; } } diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs index ed2edba5..f5d157c9 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs @@ -42,6 +42,11 @@ public class GetTrackStatusListVO /// public bool IsCompleted { get; set; } + /// + /// 是否广播 + /// + public bool IsToMq { get; set; } + /// /// 创建人 /// diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs index 199af1f3..492f0dde 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs @@ -67,6 +67,7 @@ public class TrackContentRepository : BasicRepository, ITrac Content = a.Content, EnContent = a.EnContent, TrackStatus = b.Status, + IsExternal = a.IsExternal, Node = SqlFunc.IF(b.Node == 1).Return("揽收").ElseIF(b.Node == 2).Return("清关").ElseIF(b.Node == 3) .Return("干线") .ElseIF(b.Node == 4).Return("派送").ElseIF(b.Node == 5).Return("其他") diff --git a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs index fc1ef90c..72f588e6 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs @@ -1,4 +1,4 @@ -using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; +using SJZY.Track.Domain.Aggregates.TrackFlagAggregate; using SJZY.Track.Domain.Dtos.TrackFlags; using SJZY.Track.Domain.VEntities; @@ -26,8 +26,8 @@ public class TrackFlagRepository : BasicRepository, ITrackFlagR SubSystemId = a.SubSystemId, SubSystem = b.CnName, Code = a.Code, - Flag = a.Name - //,IsFinish=a.IsCompleted + Flag = a.Name, + IsToMq = a.IsToMq }) .FirstAsync(); return detail; @@ -57,7 +57,7 @@ public class TrackFlagRepository : BasicRepository, ITrackFlagR SubSystem = b.CnName, Code = a.Code, Flag = a.Name, - //IsFinish=a.IsCompleted, + IsToMq = a.IsToMq, CreateTime = a.CreateTime, CreateUser = c.Name, UpdateTime = a.UpdateTime, diff --git a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs index cddf8faa..eaf191fc 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs @@ -28,7 +28,8 @@ public class TrackStatusRepository : BasicRepository, ITrackS NodeId = a.Node, TrackStatus = a.Status, NodeName = t.NodeName, - IsCompleted = a.IsCompleted + IsCompleted = a.IsCompleted, + IsToMq = a.IsToMq }) .FirstAsync(); return detail; @@ -67,7 +68,8 @@ public class TrackStatusRepository : BasicRepository, ITrackS UpdateTime = a.UpdateTime, UpdateUser = d.Name, SubSystem = b.CnName, - IsCompleted = a.IsCompleted + IsCompleted = a.IsCompleted, + IsToMq = a.IsToMq }) .ToPagedListAsync(input.PageIndex, input.PageSize);