优化get
This commit is contained in:
parent
79e64992c5
commit
03363887c9
@ -11,6 +11,7 @@ using APT.MS.Domain.Enums;
|
|||||||
using APT.MS.Domain.Enums.SK;
|
using APT.MS.Domain.Enums.SK;
|
||||||
using APT.Utility;
|
using APT.Utility;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using MySqlX.XDevAPI.Common;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@ -326,14 +327,30 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
|
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
|
||||||
if (string.IsNullOrEmpty(id))
|
if (string.IsNullOrEmpty(id))
|
||||||
this.ThrowError("060010");
|
this.ThrowError("060010");
|
||||||
var result = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(id, new string[] { "Nav_Report", "Nav_ApplyUser","Nav_ApplyDepartment",
|
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(id, new string[] { "Nav_Report", "Nav_ApplyUser","Nav_ApplyDepartment",
|
||||||
"Nav_ProductionUnit","Nav_RiskArea","Nav_Photos.Nav_ImgFile","Nav_Contents","Nav_CheckType","Nav_RecitifyUser","Nav_Question",
|
"Nav_ProductionUnit","Nav_RiskArea","Nav_Contents","Nav_CheckType","Nav_RecitifyUser","Nav_Question"});
|
||||||
"Nav_Files.Nav_ImgFile","Nav_Basics.Nav_Law","Nav_Reasons.Nav_Reason"});
|
if (entity != null)
|
||||||
if (result != null && result.STATUS == PFStandardStatus.Rejected)
|
|
||||||
{
|
{
|
||||||
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);
|
var newFilter = new BaseFilter(filter.OrgId);
|
||||||
|
newFilter.SelectField = new List<string> { "ID", "HIDDEN_DANGER_CONFIRM_ID", "IMG_FILE_ID", "Nav_ImgFile.Nav_File", "Nav_ImgFile.FILE_NAME", "Nav_ImgFile.FILE_PATH" };
|
||||||
|
var photos = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, newFilter).ToList();
|
||||||
|
entity.Nav_Photos = photos.ToList();
|
||||||
|
newFilter.SelectField = new List<string> { "ID", "HIDDEN_DANGER_CONFIRM_ID", "IMG_FILE_ID", "Nav_ImgFile.Nav_File", "Nav_ImgFile.FILE_NAME", "Nav_ImgFile.FILE_PATH" };
|
||||||
|
var files = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_FILE>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, newFilter).ToList();
|
||||||
|
entity.Nav_Files = files.ToList();
|
||||||
|
newFilter.SelectField = new List<string> { "ID", "HIDDEN_DANGER_CONFIRM_ID", "LAW_ID", "Nav_Law.NAME" };
|
||||||
|
var basics = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_BASIC>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, newFilter).ToList();
|
||||||
|
entity.Nav_Basics = basics.ToList();
|
||||||
|
newFilter.SelectField = new List<string> { "ID", "HIDDEN_DANGER_CONFIRM_ID", "REASON_ID", "Nav_Reason.NAME" };
|
||||||
|
var reasons = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_REASON>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, newFilter).ToList();
|
||||||
|
entity.Nav_Reasons = reasons.ToList();
|
||||||
|
if (entity.STATUS == PFStandardStatus.Rejected)
|
||||||
|
{
|
||||||
|
entity.CONTEXT = ApproveCallBackService.RejectContent(entity.ID);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
|
||||||
|
return entity;
|
||||||
});
|
});
|
||||||
//var result = WitEntity(null, filter);
|
//var result = WitEntity(null, filter);
|
||||||
//return result;
|
//return result;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user