ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【 2. 轨迹状态页面：新增编辑弹窗，列表增加是否完结的字段，非必填】

Browse Source 
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027890
This commit is contained in:
xiaolipro 2024-09-04 17:34:58 +08:00
parent 1f8a0d2f93
commit 85b05dfa5d
10 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SJZY.Track.Application.Contract/Dtos/TrackStatus/EditTrackStatusInput.cs
View File

@ -35,5 +35,10 @@ public class EditTrackStatusInput
/// <summary>
/// 轨迹状态英文
/// </summary>
public string? EntrackStatus { get; set; }
public string? EnTrackStatus { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsCompleted { get; set; }
}

7
src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs
View File

@ -35,10 +35,15 @@ public class GetTrackStatusDetailDto
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EntrackStatus { get; set; }
public string EnTrackStatus { get; set; }
/// <summary>
/// 节点名称
/// </summary>
public string? NodeName { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsCompleted { get; set; }
}

7
src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs
View File

@ -30,7 +30,12 @@ public class GetTrackStatusListDto
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EntrackStatus { get; set; }
public string EnTrackStatus { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsCompleted { get; set; }
/// <summary>
/// 创建人

2
src/SJZY.Track.Application/AutoMapper/TrackStatusAutoMapperProfile.cs
View File

@ -12,7 +12,7 @@ public class TrackStatusAutoMapperProfile : Profile
CreateMap<EditTrackStatusInput, TrackStatusEntity>(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<GetTrackStatusDetailVO, GetTrackStatusDetailDto>(MemberList.None);
CreateMap<GetPageTrackStatusInput, GetPageTrackStatusVO>(MemberList.None);

8
src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs
View File

@ -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: "该子系统下轨迹状态英文已存在");

2
src/SJZY.Track.Application/Validations/TrackStatus/EditTrackStatusInputValidation.cs
View File

@ -19,7 +19,7 @@ public class EditTrackStatusInputValidation : AbstractValidator<EditTrackStatusI
RuleFor(x => 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("轨迹状态英文不能为空！");
});
}
}

1
src/SJZY.Track.Domain/Aggregates/TrackStatusAggregate/TrackStatusEntity.cs
View File

@ -42,7 +42,6 @@ public class TrackStatusEntity : IFullAuditedBasicEntitys, IAggregateRoot
[SugarColumn(ColumnName = "EnStatus")]
public string EnStatus { get; set; } = null!;
/// <summary>
/// 是否完结
/// </summary>

7
src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs
View File

@ -35,10 +35,15 @@ public class GetTrackStatusDetailVO
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EntrackStatus { get; set; }
public string EnTrackStatus { get; set; }
/// <summary>
/// 节点名称
/// </summary>
public string? NodeName { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsCompleted { get; set; }
}

7
src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs
View File

@ -35,7 +35,12 @@ public class GetTrackStatusListVO
/// <summary>
/// 轨迹内容英文
/// </summary>
public string EntrackStatus { get; set; }
public string EnTrackStatus { get; set; }
/// <summary>
/// 是否完结
/// </summary>
public bool IsCompleted { get; set; }
/// <summary>
/// 创建人

12
src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs
View File

@ -24,10 +24,11 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, 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<TrackStatusEntity>, ITrackS
/// <returns></returns>
public async Task<UnifyPageResultDto<GetTrackStatusListVO>> GetPageTrackStatus(GetPageTrackStatusVO input)
{
UnifyPageResultDto<GetTrackStatusListVO> pagedList = await Context.Queryable<TrackStatusEntity>()
var pagedList = await Context.Queryable<TrackStatusEntity>()
.LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id && b.IsDeleted == false)
.LeftJoin<VUserEntity>((a, b, c) => a.CreateUserId == c.Id && c.IsDeleted == false)
.LeftJoin<VUserEntity>((a, b, c, d) => a.UpdateUserId == d.Id && d.IsDeleted == false)
@ -57,7 +58,7 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, 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<TrackStatusEntity>, ITrackS
CreateUser = c.Name,
UpdateTime = a.UpdateTime,
UpdateUser = d.Name,
SubSystem = b.CnName
SubSystem = b.CnName,
IsCompleted = a.IsCompleted
})
.ToPagedListAsync(input.PageIndex, input.PageSize);