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

编辑时，字符串类型的必须加?可空

Browse Source
This commit is contained in:
moyongzhen 2024-02-29 19:45:13 +08:00
parent b139734d57
commit 2603cd1ac4
4 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SJZY.Track.Application/Dtos/TrackContents/EditTrackContentInput.cs
View File

@ -31,17 +31,17 @@ namespace SJZY.Track.Application.Dtos.TrackContents
/// <summary> /// <summary>
/// 轨迹内容代码 /// 轨迹内容代码
/// </summary> /// </summary>
public string Code { get; set; } public string? Code { get; set; }
/// <summary> /// <summary>
/// 轨迹内容 /// 轨迹内容
/// </summary> /// </summary>
public string Content { get; set; } public string? Content { get; set; }
/// <summary> /// <summary>
/// 轨迹内容英文 /// 轨迹内容英文
/// </summary> /// </summary>
public string EnContent { get; set; } public string? EnContent { get; set; }
/// <summary> /// <summary>
/// 轨迹标记id /// 轨迹标记id

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

@ -31,16 +31,16 @@ namespace SJZY.Track.Application.Dtos.TrackStatus
/// <summary> /// <summary>
/// 轨迹状态代码 /// 轨迹状态代码
/// </summary> /// </summary>
public string Code { get; set; } public string? Code { get; set; }
/// <summary> /// <summary>
/// 轨迹状态 /// 轨迹状态
/// </summary> /// </summary>
public string TrackStatus { get; set; } public string? TrackStatus { get; set; }
/// <summary> /// <summary>
/// 轨迹状态英文 /// 轨迹状态英文
/// </summary> /// </summary>
public string EntrackStatus { get; set; } public string? EntrackStatus { get; set; }
} }
} }

4
src/SJZY.Track.Application/Dtos/TrackTemplates/GetTrackDetailDto.cs
View File

@ -85,11 +85,11 @@
/// <summary> /// <summary>
/// 模板名称 /// 模板名称
/// </summary> /// </summary>
public string Name { set; get; } public string? Name { set; get; }
/// <summary> /// <summary>
/// 模板代码 /// 模板代码
/// </summary> /// </summary>
public string Code { set; get; } public string? Code { set; get; }
} }
} }

25
src/SJZY.Track.Repository/OrderRepository.cs
View File

@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SJZY.Track.Domain; using SJZY.Track.Domain;
using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.OrderAggregate;
using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
using SJZY.Track.Domain.Dtos.Order; using SJZY.Track.Domain.Dtos.Order;
namespace SJZY.Track.Repository; namespace SJZY.Track.Repository;
@ -81,16 +82,26 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
public async Task<UnifyPageResultDto<TrackOrderVO>> GetPageTrackOrder(GetPageTrackOrderInputVO input) public async Task<UnifyPageResultDto<TrackOrderVO>> GetPageTrackOrder(GetPageTrackOrderInputVO input)
{ {
//await Context.Queryable<OrderEntity, OrderTemplateEntity>((a,b)= ); //await Context.Queryable<OrderEntity, OrderTemplateEntity>((a,b)= );
await Context.Queryable<OrderEntity, OrderTemplateEntity>((a, b) => new JoinQueryInfos(JoinType.Left, a.Id==b.OrderId)) //await Context.Queryable<OrderEntity, OrderTemplateEntity>((a, b) => new JoinQueryInfos(JoinType.Left, a.Id==b.OrderId))
.GroupBy((a, b) => new { a.Id }) // .GroupBy((a, b) => new { a.Id })
.Select((a, b) => new TrackOrderVO // .Select((a, b) => new TrackOrderVO
{ // {
Id=a.Id, // Id=a.Id,
OrderNumber=a.OrderNo, // OrderNumber=a.OrderNo,
// TrackTemplateNames = SqlFunc.AggregateConcat(b.)
// }).ToPageListAsync(input.PageIndex, input.PageSize);
}).ToPageListAsync(input.PageIndex, input.PageSize); //await Context.Queryable<OrderEntity>()
// .Includes(a => a.OrderTemplates)
// .Select(a => new TrackOrderVO
// {
// Id=a.Id,
// OrderNumber=a.OrderNo,
// TrackTemplateNames = SqlFunc.Subqueryable<OrderTemplateEntity>().Where(z=>z.OrderId==a.Id).SelectStringJoin(z=>z.)
// })
// .ToPageListAsync(input.PageIndex, input.PageSize);
return null; return null;
} }