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

辨识岗位bug修复

Browse Source
This commit is contained in:
何美荣 2026-06-12 11:17:16 +08:00
parent 496f0fa072
commit ed16fe1bab
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -13221,6 +13221,7 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_RISK_IDENTIFY_RESULT_REQUIRE> resultRequires = new List<T_SK_RISK_IDENTIFY_RESULT_REQUIRE>(); List<T_SK_RISK_IDENTIFY_RESULT_REQUIRE> resultRequires = new List<T_SK_RISK_IDENTIFY_RESULT_REQUIRE>();
List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE> resultDetailMes = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>(); List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE> resultDetailMes = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>();
List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST> resultDetailPosts = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(); List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST> resultDetailPosts = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>();
//List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART> resultDetailDeps = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>();
List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL> resultDetailPostDets = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>(); List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL> resultDetailPostDets = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>();
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)); var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
var posts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(entity.ORG_ID)); var posts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(entity.ORG_ID));
@ -13519,6 +13520,12 @@ namespace APT.BaseData.Services.DomainServices
var i = 1; var i = 1;
foreach (var ite in departTemps) 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(); T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST depart = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST();
depart.ORG_ID = ite.ORG_ID; depart.ORG_ID = ite.ORG_ID;
depart.DEPARTMENT_ID = ite.ID; depart.DEPARTMENT_ID = ite.ID;
@ -13574,7 +13581,9 @@ namespace APT.BaseData.Services.DomainServices
if (resultDetailPosts != null && resultDetailPosts.Count > 0) if (resultDetailPosts != null && resultDetailPosts.Count > 0)
BantchSaveEntityNoCommit(resultDetailPosts); BantchSaveEntityNoCommit(resultDetailPosts);
if (resultDetailPostDets != null && resultDetailPostDets.Count > 0) if (resultDetailPostDets != null && resultDetailPostDets.Count > 0)
BantchSaveEntityNoCommit(resultDetailPostDets); BantchSaveEntityNoCommit(resultDetailPostDets);
//if (resultDetailDeps != null && resultDetailDeps.Count > 0)
// BantchSaveEntityNoCommit(resultDetailDeps);
}); });
//待办同步 //待办同步
NotificationTaskService.TaskToHead(listAppDetail, null, null, taskFinish); NotificationTaskService.TaskToHead(listAppDetail, null, null, taskFinish);
@ -13618,8 +13627,9 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE> summaryRequires = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE>(); List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE> summaryRequires = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_REQUIRE>();
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE> summaryMeasures = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(); List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE> summaryMeasures = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>();
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST> summaryPosts = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>(); List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST> summaryPosts = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>();
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL> summaryPostDets = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(); List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL> summaryPostDets = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>();
//List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_FILE> summaryFiles = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_FILE>(); //List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART> summaryDeps = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>();
//List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_FILE> summaryFiles = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_FILE>();
var entity = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID); var entity = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
entity.STATUS = PFStandardStatus.Archived; entity.STATUS = PFStandardStatus.Archived;
//entity.END_DATE = DateTime.Now; //entity.END_DATE = DateTime.Now;
@ -13930,6 +13940,12 @@ namespace APT.BaseData.Services.DomainServices
var i = 1; var i = 1;
foreach (var ite in departTemps) 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(); T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST depart = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST();
depart.ORG_ID = ite.ORG_ID; depart.ORG_ID = ite.ORG_ID;
depart.DEPARTMENT_ID = ite.ID; depart.DEPARTMENT_ID = ite.ID;
@ -13994,7 +14010,9 @@ namespace APT.BaseData.Services.DomainServices
if (summaryPosts != null && summaryPosts.Count > 0) if (summaryPosts != null && summaryPosts.Count > 0)
BantchSaveEntityNoCommit(summaryPosts); BantchSaveEntityNoCommit(summaryPosts);
if (summaryPostDets != null && summaryPostDets.Count > 0) if (summaryPostDets != null && summaryPostDets.Count > 0)
BantchSaveEntityNoCommit(summaryPostDets); BantchSaveEntityNoCommit(summaryPostDets);
//if (summaryDeps != null && summaryDeps.Count > 0)
// BantchSaveEntityNoCommit(summaryDeps);
if (notice != null) if (notice != null)
UpdateEntityNoCommit(notice); UpdateEntityNoCommit(notice);
}, null, null, null, null, null, "SK035_SHOWPRINT", null, "安全风险辨识结果汇总表审批(" + param + ")"); }, null, null, null, null, null, "SK035_SHOWPRINT", null, "安全风险辨识结果汇总表审批(" + param + ")");
@ -14025,7 +14043,9 @@ namespace APT.BaseData.Services.DomainServices
if (summaryPosts != null && summaryPosts.Count > 0) if (summaryPosts != null && summaryPosts.Count > 0)
BantchSaveEntityNoCommit(summaryPosts); BantchSaveEntityNoCommit(summaryPosts);
if (summaryPostDets != null && summaryPostDets.Count > 0) if (summaryPostDets != null && summaryPostDets.Count > 0)
BantchSaveEntityNoCommit(summaryPostDets); BantchSaveEntityNoCommit(summaryPostDets);
//if (summaryDeps != null && summaryDeps.Count > 0)
// BantchSaveEntityNoCommit(summaryDeps);
if (notice != null) if (notice != null)
UpdateEntityNoCommit(notice); UpdateEntityNoCommit(notice);
}); });

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

@ -180,9 +180,9 @@ namespace APT.SK.WebApi.Controllers.Api
item2.RISK_EVALUATION_DETAIL_ID = de.ID; item2.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2); 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(); T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL();
item3.ORG_ID = entity.ORG_ID; item3.ORG_ID = entity.ORG_ID;

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

@ -127,9 +127,9 @@ namespace APT.SK.WebApi.Controllers.Api
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID; item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2); 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(); T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL();
item3.ORG_ID = entity.ORG_ID; item3.ORG_ID = entity.ORG_ID;