diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs index d93aea6c..27cda0eb 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs @@ -35,5 +35,10 @@ public class EditTrackStatusInput /// /// 轨迹状态英文 /// - public string? EntrackStatus { get; set; } + public string? EnTrackStatus { get; set; } + + /// + /// 是否完结 + /// + public bool IsCompleted { 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 d5742701..876ee1ee 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs @@ -35,10 +35,15 @@ public class GetTrackStatusDetailDto /// /// 轨迹内容英文 /// - public string EntrackStatus { get; set; } + public string EnTrackStatus { get; set; } /// /// 节点名称 /// public string? NodeName { get; set; } + + /// + /// 是否完结 + /// + public bool IsCompleted { 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 acfa23b5..67273950 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs @@ -30,7 +30,12 @@ public class GetTrackStatusListDto /// /// 轨迹内容英文 /// - public string EntrackStatus { get; set; } + public string EnTrackStatus { get; set; } + + /// + /// 是否完结 + /// + public bool IsCompleted { get; set; } /// /// 创建人 diff --git a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs index fb6c1b96..a0cb41c5 100644 --- a/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs +++ b/src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs @@ -12,7 +12,7 @@ public class TrackStatusAutoMapperProfile : Profile CreateMap(MemberList.None) //层级不一致的场景 .ForMember(dest => dest.Status, opt => opt.MapFrom(source => source.TrackStatus)) - .ForMember(dest => dest.EnStatus, opt => opt.MapFrom(source => source.EntrackStatus)) + .ForMember(dest => dest.EnStatus, opt => opt.MapFrom(source => source.EnTrackStatus)) .ForMember(dest => dest.Node, opt => opt.MapFrom(source => source.NodeId)); CreateMap(MemberList.None); CreateMap(MemberList.None); diff --git a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs index 8bd539a6..7349566d 100644 --- a/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs +++ b/src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs @@ -89,7 +89,7 @@ public class TrackStatusService : ApplicationService, ITransientDependency var trackStatusEntitys = await _trackStatusRepository.GetListAsync(a => a.SubSystemId == input.SubSystemId && (a.Code == input.Code || - a.Status == input.TrackStatus || a.EnStatus == input.EntrackStatus)); + a.Status == input.TrackStatus || a.EnStatus == input.EnTrackStatus)); if (trackStatusEntitys.Any()) { //throw new BusinessException(message: _stringLocalizer["TrackStatusExist"]); @@ -106,7 +106,7 @@ public class TrackStatusService : ApplicationService, ITransientDependency throw new BusinessException(message: "该子系统下轨迹状态已存在"); } - var trackStatusEnName = trackStatusEntitys.FirstOrDefault(t => t.EnStatus == input.EntrackStatus); + var trackStatusEnName = trackStatusEntitys.FirstOrDefault(t => t.EnStatus == input.EnTrackStatus); if (trackStatusEnName != null) { throw new BusinessException(message: "该子系统下轨迹状态英文已存在"); @@ -127,7 +127,7 @@ public class TrackStatusService : ApplicationService, ITransientDependency var trackStatusEntitys = await _trackStatusRepository.GetListAsync(a => a.Id != input.Id && a.SubSystemId == input.SubSystemId && (a.Code == input.Code || - a.Status == input.TrackStatus || a.EnStatus == input.EntrackStatus)); + a.Status == input.TrackStatus || a.EnStatus == input.EnTrackStatus)); if (trackStatusEntitys.Any()) { //throw new BusinessException(message: _stringLocalizer["TrackStatusExist"]); @@ -144,7 +144,7 @@ public class TrackStatusService : ApplicationService, ITransientDependency throw new BusinessException(message: "该子系统下轨迹状态已存在"); } - var trackStatusEnName = trackStatusEntitys.FirstOrDefault(t => t.EnStatus == input.EntrackStatus); + var trackStatusEnName = trackStatusEntitys.FirstOrDefault(t => t.EnStatus == input.EnTrackStatus); if (trackStatusEnName != null) { throw new BusinessException(message: "该子系统下轨迹状态英文已存在"); diff --git a/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs b/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs index 0a934319..96a00eff 100644 --- a/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs +++ b/src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs @@ -19,7 +19,7 @@ public class EditTrackStatusInputValidation : AbstractValidator x.NodeId).GreaterThan(0).WithMessage("所属节点的id必须大于0!"); RuleFor(x => x.Code).NotNull().WithMessage("轨迹状态代码必填！").NotEmpty().WithMessage("轨迹状态代码不能为空！"); RuleFor(x => x.TrackStatus).NotNull().WithMessage("轨迹状态必填！").NotEmpty().WithMessage("轨迹状态不能为空！"); - RuleFor(x => x.EntrackStatus).NotNull().WithMessage("轨迹状态英文必填！").NotEmpty().WithMessage("轨迹状态英文不能为空！"); + RuleFor(x => x.EnTrackStatus).NotNull().WithMessage("轨迹状态英文必填！").NotEmpty().WithMessage("轨迹状态英文不能为空！"); }); } } diff --git a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs index 6e9866df..4b13d3dd 100644 --- a/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs +++ b/src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs @@ -42,7 +42,6 @@ public class TrackStatusEntity : IFullAuditedBasicEntitys, IAggregateRoot [SugarColumn(ColumnName = "EnStatus")] public string EnStatus { get; set; } = null!; - /// /// 是否完结 /// diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs index 68e4fd33..15048143 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs @@ -35,10 +35,15 @@ public class GetTrackStatusDetailVO /// /// 轨迹内容英文 /// - public string EntrackStatus { get; set; } + public string EnTrackStatus { get; set; } /// /// 节点名称 /// public string? NodeName { get; set; } + + /// + /// 是否完结 + /// + public bool IsCompleted { get; set; } } diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs index 421611b5..5e54f9f7 100644 --- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs +++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs @@ -35,7 +35,12 @@ public class GetTrackStatusListVO /// /// 轨迹内容英文 /// - public string EntrackStatus { get; set; } + public string EnTrackStatus { get; set; } + + /// + /// 是否完结 + /// + public bool IsCompleted { get; set; } /// /// 创建人 diff --git a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs index 45f3bbc1..e5ae4ac7 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs @@ -24,10 +24,11 @@ public class TrackStatusRepository : BasicRepository, ITrackS SubSystemId = a.SubSystemId, SubSystem = b.CnName, Code = a.Code, - EntrackStatus = a.EnStatus, + EnTrackStatus = a.EnStatus, NodeId = a.Node, TrackStatus = a.Status, - NodeName = t.NodeName + NodeName = t.NodeName, + IsCompleted = a.IsCompleted }) .FirstAsync(); return detail; @@ -40,7 +41,7 @@ public class TrackStatusRepository : BasicRepository, ITrackS /// public async Task> GetPageTrackStatus(GetPageTrackStatusVO input) { - UnifyPageResultDto pagedList = await Context.Queryable() + var pagedList = await Context.Queryable() .LeftJoin((a, b) => a.SubSystemId == b.Id && b.IsDeleted == false) .LeftJoin((a, b, c) => a.CreateUserId == c.Id && c.IsDeleted == false) .LeftJoin((a, b, c, d) => a.UpdateUserId == d.Id && d.IsDeleted == false) @@ -57,7 +58,7 @@ public class TrackStatusRepository : BasicRepository, ITrackS { Id = a.Id, Code = a.Code, - EntrackStatus = a.EnStatus, + EnTrackStatus = a.EnStatus, TrackStatus = a.Status, NodeId = a.Node, Node = e.NodeName!, @@ -65,7 +66,8 @@ public class TrackStatusRepository : BasicRepository, ITrackS CreateUser = c.Name, UpdateTime = a.UpdateTime, UpdateUser = d.Name, - SubSystem = b.CnName + SubSystem = b.CnName, + IsCompleted = a.IsCompleted }) .ToPagedListAsync(input.PageIndex, input.PageSize);