wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

隐患确认单点开报错

Browse Source
This commit is contained in:
何美荣 2026-05-18 10:20:31 +08:00
parent d623501191
commit 79e64992c5
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs
View File

@ -1,19 +1,20 @@
using APT.BaseData.Domain.IServices.FM;
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;
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.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.SK;
using System.Threading.Tasks;
using System.Linq;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace APT.SK.WebApi.Controllers.Api
{
@ -319,14 +320,23 @@ namespace APT.SK.WebApi.Controllers.Api
/// <returns></returns>
[HttpPost, Route("SKGet")]
public JsonActionResult<T_SK_HIDDEN_DANGER_CONFIRM> SKGet([FromBody] KeywordFilter filter)
{
filter.IgnoreDataRule = true;
var result = WitEntity(null, filter);
if (result != null && result.Data != null && result.Data.STATUS == PFStandardStatus.Rejected)
{
result.Data.CONTEXT = ApproveCallBackService.RejectContent(result.Data.ID);
}
return result;
{
return SafeExecute(() => {
filter.IgnoreDataRule = true;
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
if (string.IsNullOrEmpty(id))
this.ThrowError("060010");
var result = 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_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>