Merge branch 'S06' into test
This commit is contained in:
commit
d6a4ae9266
@ -104,11 +104,13 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen
|
|||||||
.Where(x => x.SubSystemId == subSystemId && x.Code == trackCode)
|
.Where(x => x.SubSystemId == subSystemId && x.Code == trackCode)
|
||||||
.Select((x, y, z, k) => new TrackContentVO
|
.Select((x, y, z, k) => new TrackContentVO
|
||||||
{
|
{
|
||||||
|
SubSystemId = x.SubSystemId,
|
||||||
SubSystemCode = z.Key,
|
SubSystemCode = z.Key,
|
||||||
TrackStatusId = x.TrackStatusId,
|
TrackStatusId = x.TrackStatusId,
|
||||||
TrackStatus = y.Status,
|
TrackStatus = y.Status,
|
||||||
TrackStatusCode = y.Code,
|
TrackStatusCode = y.Code,
|
||||||
TrackContentCode = x.Code,
|
TrackContentCode = x.Code,
|
||||||
|
TrackContentId = x.Id,
|
||||||
TrackContent = x.Content,
|
TrackContent = x.Content,
|
||||||
TrackEnContent = x.EnContent,
|
TrackEnContent = x.EnContent,
|
||||||
IsCompleted = y.IsCompleted,
|
IsCompleted = y.IsCompleted,
|
||||||
@ -135,6 +137,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, ITransientDepen
|
|||||||
TrackStatus = y.Status,
|
TrackStatus = y.Status,
|
||||||
TrackStatusCode = y.Code,
|
TrackStatusCode = y.Code,
|
||||||
TrackContentCode = x.Code,
|
TrackContentCode = x.Code,
|
||||||
|
TrackContentId = x.Id,
|
||||||
TrackContent = x.Content,
|
TrackContent = x.Content,
|
||||||
TrackEnContent = x.EnContent,
|
TrackEnContent = x.EnContent,
|
||||||
IsCompleted = y.IsCompleted,
|
IsCompleted = y.IsCompleted,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user