diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index cf3a806..e8f168b 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -13221,6 +13221,7 @@ namespace APT.BaseData.Services.DomainServices List resultRequires = new List(); List resultDetailMes = new List(); List resultDetailPosts = new List(); + //List resultDetailDeps = new List(); List resultDetailPostDets = new List(); var departs = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)); var posts = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(entity.ORG_ID)); @@ -13519,6 +13520,12 @@ namespace APT.BaseData.Services.DomainServices var i = 1; foreach (var ite in departTemps) { + //T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART depart2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART(); + //depart2.ORG_ID = ite.ORG_ID; + //depart2.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID; + //depart2.DEPARTMENT_TYPE = (FMDepartmentType)ite.DEPARTMENT_TYPE; + //depart2.DEPARTMENT_ID = ite.ID; + //resultDetailDeps.Add(depart2); T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST depart = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST(); depart.ORG_ID = ite.ORG_ID; depart.DEPARTMENT_ID = ite.ID; @@ -13574,7 +13581,9 @@ namespace APT.BaseData.Services.DomainServices if (resultDetailPosts != null && resultDetailPosts.Count > 0) BantchSaveEntityNoCommit(resultDetailPosts); if (resultDetailPostDets != null && resultDetailPostDets.Count > 0) - BantchSaveEntityNoCommit(resultDetailPostDets); + BantchSaveEntityNoCommit(resultDetailPostDets); + //if (resultDetailDeps != null && resultDetailDeps.Count > 0) + // BantchSaveEntityNoCommit(resultDetailDeps); }); //待办同步 NotificationTaskService.TaskToHead(listAppDetail, null, null, taskFinish); @@ -13618,8 +13627,9 @@ namespace APT.BaseData.Services.DomainServices List summaryRequires = new List(); List summaryMeasures = new List(); List summaryPosts = new List(); - List summaryPostDets = new List(); - //List summaryFiles = new List(); + List summaryPostDets = new List(); + //List summaryDeps = new List(); + //List summaryFiles = new List(); var entity = this.GetEntity(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID); entity.STATUS = PFStandardStatus.Archived; //entity.END_DATE = DateTime.Now; @@ -13930,6 +13940,12 @@ namespace APT.BaseData.Services.DomainServices var i = 1; foreach (var ite in departTemps) { + //T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART depart2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART(); + //depart2.ORG_ID = ite.ORG_ID; + //depart2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = ideDetail.ID; + //depart2.DEPARTMENT_TYPE = (FMDepartmentType)ite.DEPARTMENT_TYPE; + //depart2.DEPARTMENT_ID = ite.ID; + //summaryDeps.Add(depart2); T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST depart = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST(); depart.ORG_ID = ite.ORG_ID; depart.DEPARTMENT_ID = ite.ID; @@ -13994,7 +14010,9 @@ namespace APT.BaseData.Services.DomainServices if (summaryPosts != null && summaryPosts.Count > 0) BantchSaveEntityNoCommit(summaryPosts); if (summaryPostDets != null && summaryPostDets.Count > 0) - BantchSaveEntityNoCommit(summaryPostDets); + BantchSaveEntityNoCommit(summaryPostDets); + //if (summaryDeps != null && summaryDeps.Count > 0) + // BantchSaveEntityNoCommit(summaryDeps); if (notice != null) UpdateEntityNoCommit(notice); }, null, null, null, null, null, "SK035_SHOWPRINT", null, "安全风险辨识结果汇总表审批(" + param + ")"); @@ -14025,7 +14043,9 @@ namespace APT.BaseData.Services.DomainServices if (summaryPosts != null && summaryPosts.Count > 0) BantchSaveEntityNoCommit(summaryPosts); if (summaryPostDets != null && summaryPostDets.Count > 0) - BantchSaveEntityNoCommit(summaryPostDets); + BantchSaveEntityNoCommit(summaryPostDets); + //if (summaryDeps != null && summaryDeps.Count > 0) + // BantchSaveEntityNoCommit(summaryDeps); if (notice != null) UpdateEntityNoCommit(notice); }); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index aadb513..801dbb5 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -180,9 +180,9 @@ namespace APT.SK.WebApi.Controllers.Api item2.RISK_EVALUATION_DETAIL_ID = de.ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; postList.Add(item2); - if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any()) + if (mm.Nav_PostDetails != null && mm.Nav_PostDetails.Any()) { - foreach (var nn in item2.Nav_PostDetails) + foreach (var nn in mm.Nav_PostDetails) { T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL(); item3.ORG_ID = entity.ORG_ID; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs index 020363f..46761df 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs @@ -127,9 +127,9 @@ namespace APT.SK.WebApi.Controllers.Api item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; postList.Add(item2); - if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any()) + if (mm.Nav_PostDetails != null && mm.Nav_PostDetails.Any()) { - foreach (var nn in item2.Nav_PostDetails) + foreach (var nn in mm.Nav_PostDetails) { T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL(); item3.ORG_ID = entity.ORG_ID;