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:
何美荣 2025-10-09 10:57:35 +08:00
parent 74143528c7
commit 84e6d0b6d8
14 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/BasicLibraryController.cs
View File

@ -509,7 +509,7 @@ namespace APT.SK.WebApi.Controllers
if (!string.IsNullOrEmpty(id)) if (!string.IsNullOrEmpty(id))
{ {
result = this.GetEntity<T_SK_BASIC_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName", result = this.GetEntity<T_SK_BASIC_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"}); "Nav_SCOREL","Nav_SCOREE","Nav_SCOREC","Nav_ProductionUnit"});
} }
if (result != null) if (result != null)
{ {

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs
View File

@ -491,7 +491,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_DoubleFiles.Nav_ImgFile"}); "Nav_DoubleFiles.Nav_ImgFile"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>(t => t.DOUBLE_PREVENT_MECHANISM_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC"); var details = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>(t => t.DOUBLE_PREVENT_MECHANISM_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC", "Nav_ProductionUnit");
if (details.Any()) if (details.Any())
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -2078,7 +2078,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (!string.IsNullOrEmpty(id)) if (!string.IsNullOrEmpty(id))
{ {
result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName", result = this.GetEntity<T_SK_ENTERPRISE_LIBRARY>(id, new string[] { "Nav_Type", "Nav_Area","Nav_RiskName",
"Nav_SCOREL","Nav_SCOREE","Nav_SCOREC"}); "Nav_SCOREL","Nav_SCOREE","Nav_SCOREC","Nav_ProductionUnit"});
} }
else if (mineType != null && areaId != null && riskName != null)//&& typeId != null && riskDes!=null else if (mineType != null && areaId != null && riskName != null)//&& typeId != null && riskDes!=null
{ {

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs
View File

@ -402,7 +402,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_RectifyFiles.Nav_ImgFile"}); "Nav_RectifyFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ImplementUser", "Nav_AcceptUser", "Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetailBasics.Nav_Law"); var details = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => t.HIDDEN_DANGER_RECTIFY_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ImplementUser", "Nav_AcceptUser", "Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetailBasics.Nav_Law");
@ -428,7 +428,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law", "Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law",
"Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile",
"Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile"}); "Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())//&& taskId != null if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())//&& taskId != null
{ {
@ -455,7 +455,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law", "Nav_RectifyDetails","Nav_RectifyDetails.Nav_RiskArea","Nav_RectifyDetails.Nav_Contents","Nav_RectifyDetails.Nav_Question","Nav_RectifyDetails.Nav_RectifyDetailBasics.Nav_Law",
"Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile", "Nav_RectifyDetails.Nav_AcceptUser", "Nav_RectifyDetails.Nav_ImplementUser","Nav_RectifyDetails.Nav_RectifyDetailFiles.Nav_ImgFile",
"Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile"}); "Nav_RectifyFiles","Nav_RectifyFiles.Nav_ImgFile", "Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())// && taskId != null if (result != null && result.Nav_RectifyDetails != null && result.Nav_RectifyDetails.Any())// && taskId != null
{ {

3
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -426,7 +426,7 @@ namespace APT.SK.WebApi.Controllers
if (string.IsNullOrEmpty(id)) if (string.IsNullOrEmpty(id))
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType","Nav_RiskArea","Nav_Contents","Nav_Question", var result = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType","Nav_RiskArea","Nav_Contents","Nav_Question","Nav_ProductionUnit",
"Nav_RecitifyUser.Nav_Department","Nav_RecitifyUser.Nav_UserSignFiles","Nav_ImplementUser.Nav_UserSignFiles","Nav_AcceptUser.Nav_UserSignFiles","Nav_AcceptUser","Nav_RectifyPhotoas.Nav_ImgFile","Nav_RectifyPhotobs.Nav_ImgFile","Nav_RectifyFiles.Nav_ImgFile","Nav_RectifyBasics.Nav_Law"}); "Nav_RecitifyUser.Nav_Department","Nav_RecitifyUser.Nav_UserSignFiles","Nav_ImplementUser.Nav_UserSignFiles","Nav_AcceptUser.Nav_UserSignFiles","Nav_AcceptUser","Nav_RectifyPhotoas.Nav_ImgFile","Nav_RectifyPhotobs.Nav_ImgFile","Nav_RectifyFiles.Nav_ImgFile","Nav_RectifyBasics.Nav_Law"});
if (result != null && result.STATUS == PFStandardStatus.Rejected) if (result != null && result.STATUS == PFStandardStatus.Rejected)
{ {
@ -571,6 +571,7 @@ namespace APT.SK.WebApi.Controllers
pageFilter.Include.Add("Nav_ApplyDepartment"); pageFilter.Include.Add("Nav_ApplyDepartment");
pageFilter.Include.Add("Nav_RecitifyUser"); pageFilter.Include.Add("Nav_RecitifyUser");
pageFilter.Include.Add("Nav_CheckType"); pageFilter.Include.Add("Nav_CheckType");
pageFilter.Include.Add("Nav_ProductionUnit");
result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(null, pageFilter);
return result; return result;
} }

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs
View File

@ -266,7 +266,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_ReportDetails","Nav_ReportDetails.Nav_RiskArea","Nav_ReportDetails.Nav_Contents","Nav_ReportDetails.Nav_Question","Nav_ReportDetails.Nav_ReportDetailBasics.Nav_Law", "Nav_ReportDetails","Nav_ReportDetails.Nav_RiskArea","Nav_ReportDetails.Nav_Contents","Nav_ReportDetails.Nav_Question","Nav_ReportDetails.Nav_ReportDetailBasics.Nav_Law",
"Nav_ReportDetails.Nav_RecitifyUser.Nav_UserSignFiles", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile", "Nav_ReportDetails.Nav_RecitifyUser.Nav_UserSignFiles", "Nav_ReportDetails.Nav_ReportDetailFiles.Nav_ImgFile",
"Nav_ReportFiles","Nav_ReportFiles.Nav_ImgFile"}); "Nav_ReportFiles","Nav_ReportFiles.Nav_ImgFile", "Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())// && taskId != null if (result != null && result.Nav_ReportDetails != null && result.Nav_ReportDetails.Any())// && taskId != null
{ {
@ -451,7 +451,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_ReportFiles.Nav_ImgFile"}); "Nav_ReportFiles.Nav_ImgFile", "Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ReportDetailBasics.Nav_Law", "Nav_ReportDetailFiles.Nav_ImgFile"); var details = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_RecitifyUser", "Nav_ReportDetailBasics.Nav_Law", "Nav_ReportDetailFiles.Nav_ImgFile");

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -241,7 +241,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL>(t => t.RISK_EVALUATION_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC"); var details = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL>(t => t.RISK_EVALUATION_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC", "Nav_ProductionUnit");
if (details.Any()) if (details.Any())
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs
View File

@ -163,7 +163,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC"); var details = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC", "Nav_ProductionUnit");
if (details.Any()) if (details.Any())
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -212,7 +212,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
View File

@ -233,7 +233,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(t => t.RISK_IDENTIFY_RESULT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(t => t.RISK_IDENTIFY_RESULT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs
View File

@ -185,7 +185,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile"}); "Nav_Files.Nav_ImgFile"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(t => t.IDENTIFY_RESULT_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(t => t.IDENTIFY_RESULT_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -304,7 +304,7 @@ namespace APT.SK.WebApi.Controllers.Api
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckNoticeDetails","Nav_CheckNoticeDetails.Nav_RiskArea","Nav_CheckNoticeDetails.Nav_Contents","Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.Nav_Law", "Nav_CheckNoticeDetails","Nav_CheckNoticeDetails.Nav_RiskArea","Nav_CheckNoticeDetails.Nav_Contents","Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.Nav_Law",
"Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.Nav_User","Nav_CheckNoticeFiles","Nav_CheckNoticeFiles.Nav_ImgFile"}); "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.Nav_User","Nav_CheckNoticeFiles","Nav_CheckNoticeFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckNoticeDetails != null && result.Nav_CheckNoticeDetails.Any())// && taskId!=null if (result != null && result.Nav_CheckNoticeDetails != null && result.Nav_CheckNoticeDetails.Any())// && taskId!=null
{ {
@ -461,7 +461,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckNoticeFiles.Nav_ImgFile"}); "Nav_CheckNoticeFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>(t => t.SECURITY_INSPECTION_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_CheckNoticeDetailBasics.Nav_Law"); var details = this.GetEntities<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>(t => t.SECURITY_INSPECTION_NOTICE_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_CheckNoticeDetailBasics.Nav_Law");

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
View File

@ -1127,7 +1127,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile", "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile"}); "Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any()) if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())
{ {
@ -1241,7 +1241,7 @@ namespace APT.SK.WebApi.Controllers.Api
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordFiles.Nav_ImgFile"}); "Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile"); var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile");

4
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
View File

@ -598,7 +598,7 @@ namespace APT.SK.WebApi.Controllers.Api
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] {"Nav_ApplyUser","Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetails","Nav_CheckRecordDetails.Nav_RiskArea","Nav_CheckRecordDetails.Nav_Contents","Nav_CheckRecordDetails.Nav_Question","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.Nav_Law",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile", "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.Nav_User", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.Nav_ImgFile",
"Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile"}); "Nav_CheckRecordFiles","Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
//var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value; //var taskId = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "TASK_ID").Value;
if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())// && taskId != null if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())// && taskId != null
{ {
@ -715,7 +715,7 @@ namespace APT.SK.WebApi.Controllers.Api
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType", var result = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_CheckType",
"Nav_CheckRecordFiles.Nav_ImgFile"}); "Nav_CheckRecordFiles.Nav_ImgFile","Nav_ProductionUnit"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile"); var details = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_RiskArea", "Nav_Contents", "Nav_Question", "Nav_CheckRecordDetailBasics.Nav_Law", "Nav_CheckRecordDetailFiles.Nav_ImgFile");