ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改

Browse Source
This commit is contained in:
wjn 2024-06-26 10:31:30 +08:00
parent ca898f934d
commit a5f00ca286
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5404,6 +5404,7 @@ namespace APT.BaseData.Services.DomainServices
List<T_HM_HAZARD_TASK> hazards = new List<T_HM_HAZARD_TASK>(); List<T_HM_HAZARD_TASK> hazards = new List<T_HM_HAZARD_TASK>();
List<T_HM_HAZARD_TASK_DETAIL> listHazardDetails = new List<T_HM_HAZARD_TASK_DETAIL>(); List<T_HM_HAZARD_TASK_DETAIL> listHazardDetails = new List<T_HM_HAZARD_TASK_DETAIL>();
List<T_HM_HAZARD_TASK_IDENTIFYING> listHazardIdentifyings = new List<T_HM_HAZARD_TASK_IDENTIFYING>(); List<T_HM_HAZARD_TASK_IDENTIFYING> listHazardIdentifyings = new List<T_HM_HAZARD_TASK_IDENTIFYING>();
List<T_HM_HAZARD_TASK_DETAIL_IDENTIFYING> listDetailHazardIdentifyings = new List<T_HM_HAZARD_TASK_DETAIL_IDENTIFYING>();
List<T_HM_HAZARD_TASK_AREA> listHazardArea = new List<T_HM_HAZARD_TASK_AREA>(); List<T_HM_HAZARD_TASK_AREA> listHazardArea = new List<T_HM_HAZARD_TASK_AREA>();
List<T_HM_RISK_TASK_USER> taskUsers = new List<T_HM_RISK_TASK_USER>(); List<T_HM_RISK_TASK_USER> taskUsers = new List<T_HM_RISK_TASK_USER>();
List<T_FM_NOTIFICATION_TASK> sendNoticeList = null; List<T_FM_NOTIFICATION_TASK> sendNoticeList = null;
@ -5539,7 +5540,7 @@ namespace APT.BaseData.Services.DomainServices
hazardTask.ORG_ID = entity.ORG_ID; hazardTask.ORG_ID = entity.ORG_ID;
hazardTask.LIABLE_USER_ID = hazardDetail.CHARGE_USER_ID; hazardTask.LIABLE_USER_ID = hazardDetail.CHARGE_USER_ID;
hazardTask.PLAN_ID = entity.ID; hazardTask.PLAN_ID = entity.ID;
hazardDetail.Nav_Areas.ForEach(t => foreach(var t in hazardDetail.Nav_Areas)
{ {
T_HM_HAZARD_TASK_AREA area = new T_HM_HAZARD_TASK_AREA(); T_HM_HAZARD_TASK_AREA area = new T_HM_HAZARD_TASK_AREA();
area.ORG_ID = entity.ORG_ID; area.ORG_ID = entity.ORG_ID;
@ -5547,13 +5548,25 @@ namespace APT.BaseData.Services.DomainServices
area.TASK_ID = hazardTask.ID; area.TASK_ID = hazardTask.ID;
listHazardArea.Add(area); listHazardArea.Add(area);
T_HM_HAZARD_TASK_DETAIL taskDetail = new T_HM_HAZARD_TASK_DETAIL(); T_HM_HAZARD_TASK_DETAIL taskDetail = new T_HM_HAZARD_TASK_DETAIL();
taskDetail.ID = Guid.NewGuid();
taskDetail.ORG_ID = entity.ORG_ID; taskDetail.ORG_ID = entity.ORG_ID;
taskDetail.AREA_ID = t.AREA_ID; taskDetail.AREA_ID = t.AREA_ID;
taskDetail.TASK_ID = hazardTask.ID; taskDetail.TASK_ID = hazardTask.ID;
taskDetail.RECORD_USER_ID = null; taskDetail.RECORD_USER_ID = null;
taskDetail.DEAL_STATUS = (int)FOUserShiftStatusEnum.待处理; taskDetail.DEAL_STATUS = (int)FOUserShiftStatusEnum.待处理;
listHazardDetails.Add(taskDetail); listHazardDetails.Add(taskDetail);
}); BaseFilter hazardfilter = new BaseFilter(orgId);
hazardfilter.SelectField = new string[] { "IDENTIFYING_ID" };
var hazarddb = GetEntities<T_HM_EVALUATE_HAZARD>(t => t.AREA_ID == t.AREA_ID && t.STATUS == 0, hazardfilter);
foreach(var hazard in hazarddb)
{
T_HM_HAZARD_TASK_DETAIL_IDENTIFYING taskDetailIdentify = new T_HM_HAZARD_TASK_DETAIL_IDENTIFYING();
taskDetailIdentify.ORG_ID = entity.ORG_ID;
taskDetailIdentify.IDENTIFYING_ID = hazard.IDENTIFYING_ID;
taskDetailIdentify.TASK_DETAIL_ID = taskDetail.ID;
listDetailHazardIdentifyings.Add(taskDetailIdentify);
}
};
if (hazardDetail.Nav_Identifyings != null && hazardDetail.Nav_Identifyings.Any()) if (hazardDetail.Nav_Identifyings != null && hazardDetail.Nav_Identifyings.Any())
{ {
@ -5598,6 +5611,8 @@ namespace APT.BaseData.Services.DomainServices
BantchAddEntityNoCommit(listHazardIdentifyings); BantchAddEntityNoCommit(listHazardIdentifyings);
if (listHazardDetails.Any()) if (listHazardDetails.Any())
BantchAddEntityNoCommit(listHazardDetails); BantchAddEntityNoCommit(listHazardDetails);
if (listDetailHazardIdentifyings.Any())
BantchAddEntityNoCommit(listDetailHazardIdentifyings);
if (taskUsers.Any()) if (taskUsers.Any())
BantchAddEntityNoCommit(taskUsers); BantchAddEntityNoCommit(taskUsers);
if (sendNoticeList != null && sendNoticeList.Any()) if (sendNoticeList != null && sendNoticeList.Any())

2
APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs
View File

@ -258,7 +258,7 @@ namespace APT.HM.WebApi.Controllers.Api
var dangerDB = this.GetEntities<T_HM_EVALUATE_HAZARD>(t => areaList.Contains((Guid)t.AREA_ID) && t.STATUS == (int)HMOperationStepEnum.有效, baseFilter); var dangerDB = this.GetEntities<T_HM_EVALUATE_HAZARD>(t => areaList.Contains((Guid)t.AREA_ID) && t.STATUS == (int)HMOperationStepEnum.有效, baseFilter);
foreach (var detail in currDetail) foreach (var detail in currDetail)
{ {
var dangerDBAreas = dangerDB.Where(t => t.AREA_ID == detail.AREA_ID && detail.Nav_Identifyings.Select(x => x.ID).Contains(t.IDENTIFYING_ID)); var dangerDBAreas = dangerDB.Where(t => t.AREA_ID == detail.AREA_ID && detail.Nav_Identifyings.Select(x => x.IDENTIFYING_ID).Contains(t.IDENTIFYING_ID));
if (dangerDBAreas.Any()) if (dangerDBAreas.Any())
{ {
foreach (var danger in dangerDBAreas) foreach (var danger in dangerDBAreas)