隐患确认单点开报错
This commit is contained in:
parent
d623501191
commit
79e64992c5
@ -1,19 +1,20 @@
|
|||||||
using APT.BaseData.Domain.IServices.FM;
|
using APT.BaseData.Domain.Entities;
|
||||||
using APT.BaseData.Domain.IServices;
|
|
||||||
using APT.Infrastructure.Core;
|
|
||||||
using APT.MS.Domain.Entities.SK;
|
|
||||||
using APT.Utility;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using APT.BaseData.Domain.Entities.FM;
|
using APT.BaseData.Domain.Entities.FM;
|
||||||
using APT.BaseData.Domain.Entities;
|
|
||||||
using APT.BaseData.Domain.Enums.PF;
|
|
||||||
using APT.BaseData.Domain.Enums;
|
using APT.BaseData.Domain.Enums;
|
||||||
|
using APT.BaseData.Domain.Enums.PF;
|
||||||
|
using APT.BaseData.Domain.IServices;
|
||||||
|
using APT.BaseData.Domain.IServices.FM;
|
||||||
|
using APT.Infrastructure.Core;
|
||||||
|
using APT.MS.Domain.Entities.FO;
|
||||||
|
using APT.MS.Domain.Entities.SK;
|
||||||
using APT.MS.Domain.Enums;
|
using APT.MS.Domain.Enums;
|
||||||
using APT.MS.Domain.Enums.SK;
|
using APT.MS.Domain.Enums.SK;
|
||||||
using System.Threading.Tasks;
|
using APT.Utility;
|
||||||
using System.Linq;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace APT.SK.WebApi.Controllers.Api
|
namespace APT.SK.WebApi.Controllers.Api
|
||||||
{
|
{
|
||||||
@ -319,14 +320,23 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost, Route("SKGet")]
|
[HttpPost, Route("SKGet")]
|
||||||
public JsonActionResult<T_SK_HIDDEN_DANGER_CONFIRM> SKGet([FromBody] KeywordFilter filter)
|
public JsonActionResult<T_SK_HIDDEN_DANGER_CONFIRM> SKGet([FromBody] KeywordFilter filter)
|
||||||
{
|
{
|
||||||
filter.IgnoreDataRule = true;
|
return SafeExecute(() => {
|
||||||
var result = WitEntity(null, filter);
|
filter.IgnoreDataRule = true;
|
||||||
if (result != null && result.Data != null && result.Data.STATUS == PFStandardStatus.Rejected)
|
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
|
||||||
{
|
if (string.IsNullOrEmpty(id))
|
||||||
result.Data.CONTEXT = ApproveCallBackService.RejectContent(result.Data.ID);
|
this.ThrowError("060010");
|
||||||
}
|
var result = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(id, new string[] { "Nav_Report", "Nav_ApplyUser","Nav_ApplyDepartment",
|
||||||
return result;
|
"Nav_ProductionUnit","Nav_RiskArea","Nav_Photos.Nav_ImgFile","Nav_Contents","Nav_CheckType","Nav_RecitifyUser","Nav_Question",
|
||||||
|
"Nav_Files.Nav_ImgFile","Nav_Basics.Nav_Law","Nav_Reasons.Nav_Reason"});
|
||||||
|
if (result != null && result.STATUS == PFStandardStatus.Rejected)
|
||||||
|
{
|
||||||
|
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
});
|
||||||
|
//var result = WitEntity(null, filter);
|
||||||
|
//return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user