作业任务库
This commit is contained in:
parent
2094e145ef
commit
08bdc22a45
@ -120,12 +120,24 @@ namespace APT.HM.WebApi.Controllers.Api
|
|||||||
if (string.IsNullOrEmpty(id))
|
if (string.IsNullOrEmpty(id))
|
||||||
this.ThrowError("030017");
|
this.ThrowError("030017");
|
||||||
var result = this.GetEntity<T_HM_OPERATION_LINK>(id, new string[] { "Nav_OperationStep", "Nav_WorkPermitType","Nav_LinkPost","Nav_LinkPost.Nav_Post",
|
var result = this.GetEntity<T_HM_OPERATION_LINK>(id, new string[] { "Nav_OperationStep", "Nav_WorkPermitType","Nav_LinkPost","Nav_LinkPost.Nav_Post",
|
||||||
"Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures", "Nav_Files" });
|
"Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures", "Nav_Files","Nav_Unit" });
|
||||||
if (result.Nav_LinkPost != null && result.Nav_LinkPost.Any())
|
if (result.Nav_LinkPost != null && result.Nav_LinkPost.Any())
|
||||||
{
|
{
|
||||||
var postName = result.Nav_LinkPost.Where(t=>t.Nav_Post!=null).Select(m => m.Nav_Post.NAME).Distinct().ToList();
|
var postName = result.Nav_LinkPost.Where(t=>t.Nav_Post!=null).Select(m => m.Nav_Post.NAME).Distinct().ToList();
|
||||||
result.POST = string.Join(",", postName);
|
result.POST = string.Join(",", postName);
|
||||||
}
|
}
|
||||||
|
if (result.Nav_SafeConfirms != null && result.Nav_SafeConfirms.Any())
|
||||||
|
{
|
||||||
|
result.Nav_SafeConfirms.OrderBy(t => t.NUM);
|
||||||
|
}
|
||||||
|
if (result.Nav_SafeMeasures != null && result.Nav_SafeMeasures.Any())
|
||||||
|
{
|
||||||
|
result.Nav_SafeMeasures.OrderBy(t => t.NUM);
|
||||||
|
}
|
||||||
|
if (result.Nav_DealMeasures != null && result.Nav_DealMeasures.Any())
|
||||||
|
{
|
||||||
|
result.Nav_DealMeasures.OrderBy(t => t.NUM);
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user