master
parent
1fde08a04a
commit
61525a52c6
|
|
@ -213,8 +213,8 @@ namespace OpenAuth.App
|
|||
var result = await base.Repository.AsQueryable()
|
||||
.Where(p => p.Id == id)
|
||||
.LeftJoin<SysUser>((p, u) => p.Initiator == u.Id.ToString())
|
||||
.LeftJoin<SysUser>((p, u, u2) => p.Reviewer == u2.Id.ToString())
|
||||
.Select((p, u, u2) => new
|
||||
//.LeftJoin<SysUser>((p, u, u2) => p.Reviewer == u2.Id.ToString())
|
||||
.Select((p,u) => new
|
||||
{
|
||||
// 提车信息
|
||||
PickupId = p.Id,
|
||||
|
|
@ -223,7 +223,13 @@ namespace OpenAuth.App
|
|||
InitiatorName = u.Name,
|
||||
p.InitiateTime,
|
||||
p.Reviewer,
|
||||
ReviewerName = u2.Name,
|
||||
p.ReviewerName,
|
||||
p.ReviewerSignature,
|
||||
p.SeReviewerName,
|
||||
p.SeReviewerSignature,
|
||||
p.SeReviewTime,
|
||||
p.SeReviewComments,
|
||||
p.ReviewComments,
|
||||
p.ReviewTime,
|
||||
p.Remark,
|
||||
p.ViolationReportId,
|
||||
|
|
@ -336,7 +342,14 @@ namespace OpenAuth.App
|
|||
result.Reviewer,
|
||||
result.ReviewerName,
|
||||
result.ReviewTime,
|
||||
result.Remark
|
||||
result.Remark,
|
||||
result.ReviewComments,
|
||||
result.ReviewerSignature,
|
||||
result.SeReviewComments,
|
||||
result.SeReviewerName,
|
||||
result.SeReviewTime,
|
||||
result.SeReviewerSignature
|
||||
|
||||
},
|
||||
|
||||
ViolationReport = new
|
||||
|
|
|
|||
Loading…
Reference in New Issue