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

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wyw 2024-06-27 11:50:38 +08:00
commit aaa7f288ff
7 changed files with 58 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
APT.BaseData.Services/Services/FM/FMDepartmentService.cs
View File

@ -180,7 +180,15 @@ namespace APT.BaseData.Services.Services.FM
document.VALID_TIME = VALID_TIME; document.VALID_TIME = VALID_TIME;
if (document.Nav_Details != null) if (document.Nav_Details != null)
{ {
versionNum = document.Nav_Details.OrderByDescending(t => t.VERSION).FirstOrDefault().VERSION; var version = document.Nav_Details.OrderByDescending(t => t.VERSION).FirstOrDefault();
if (version != null)
{
versionNum = version.VERSION;
}
else
{
versionNum = 0;
}
} }
foreach (var item in document.Nav_Details) foreach (var item in document.Nav_Details)
{ {

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

@ -5360,20 +5360,7 @@ namespace APT.BaseData.Services.DomainServices
fileIds.Add(file.IMG_FILE_ID); fileIds.Add(file.IMG_FILE_ID);
} }
DepartmentService.AddDocument("风险管理", "年度风险评价计划审核表", "年度风险评价计划", "附件", "计划文件", DateTime.Now.AddYears(1), entity.ID, fileIds, entity.RELEASE_USER_ID); DepartmentService.AddDocument("风险管理", "年度风险评价计划审核表", "年度风险评价计划", "附件", "计划文件", DateTime.Now.AddYears(1), entity.ID, fileIds, entity.RELEASE_USER_ID);
var teamLeaders = GetEntities<T_PF_APPROVE_TEMP_DETAIL>(t => t.NAME == "风险管理小组组长" || t.NAME == "风险管理小组副组长", new BaseFilter(orgId));
if (teamLeaders != null && teamLeaders.Any())
{
var leader = teamLeaders.Where(t => t.NAME == "风险管理小组组长");
foreach (var leaderuser in leader)
{
leaderuser.DEFAULT_APPROVE_USER_ID = entity.GROUP_LEADER_ID;
}
var deputyLeader = teamLeaders.Where(t => t.NAME == "风险管理小组副组长");
foreach (var leaderuser in deputyLeader)
{
leaderuser.DEFAULT_APPROVE_USER_ID = entity.DEPUTY_GROUP_LEADER_ID;
}
}
if (orgId == Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"))//行洛坑 if (orgId == Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"))//行洛坑
{ {
sendUser = (Guid)GetEntity<T_FM_DEPARTMENT>(t => t.NAME == "办公室").USER_ID; sendUser = (Guid)GetEntity<T_FM_DEPARTMENT>(t => t.NAME == "办公室").USER_ID;
@ -5404,6 +5391,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 +5527,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 +5535,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 +5598,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())
@ -5612,7 +5614,6 @@ namespace APT.BaseData.Services.DomainServices
UpdateEntityNoCommit(entity, "STATUS"); UpdateEntityNoCommit(entity, "STATUS");
UpdateEntityNoCommit(model); UpdateEntityNoCommit(model);
BantchAddEntityNoCommit(noticefiles); BantchAddEntityNoCommit(noticefiles);
BantchUpdateEntityNoCommit(teamLeaders);
}); });
return true; return true;

8
APT.MS.Domain/Enums/HM/HMEnmu.cs
View File

@ -58,13 +58,13 @@ namespace APT.MS.Domain.Enums
} }
public enum EvaluateLevelEnum public enum EvaluateLevelEnum
{ {
[Description("1级")] [Description("重大风险")]
一级 = 10, 一级 = 10,
[Description("2级")] [Description("较大风险")]
二级 = 20, 二级 = 20,
[Description("3级")] [Description("一般风险")]
三级 = 30, 三级 = 30,
[Description("4级")] [Description("低风险")]
四级 = 40, 四级 = 40,
} }
public enum HazardLevelEnum public enum HazardLevelEnum

13
APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs
View File

@ -363,9 +363,10 @@ namespace APT.HM.WebApi.Controllers.Api
{ {
item.RISK_PLACE = dtSource.Rows[i][6].ToString().Trim(); item.RISK_PLACE = dtSource.Rows[i][6].ToString().Trim();
} }
if (!string.IsNullOrEmpty(dtSource.Rows[i][7].ToString().Trim()))//L var scoreL = dtSource.Rows[i][7].ToString().Trim();
if (!string.IsNullOrEmpty(scoreL))//L
{ {
item.EVALUATE_L = decimal.Parse(dtSource.Rows[i][7].ToString().Trim()); item.EVALUATE_L = decimal.Parse(scoreL);
} }
if (!string.IsNullOrEmpty(dtSource.Rows[i][8].ToString().Trim()))//E if (!string.IsNullOrEmpty(dtSource.Rows[i][8].ToString().Trim()))//E
{ {
@ -381,19 +382,19 @@ namespace APT.HM.WebApi.Controllers.Api
} }
if (!string.IsNullOrEmpty(dtSource.Rows[i][11].ToString().Trim()))//风险等级 if (!string.IsNullOrEmpty(dtSource.Rows[i][11].ToString().Trim()))//风险等级
{ {
if (dtSource.Rows[i][11].ToString().Trim() == "一级") if (dtSource.Rows[i][11].ToString().Trim() == "重大风险")
{ {
item.EVALUATE_LEVEL = EvaluateLevelEnum.一级; item.EVALUATE_LEVEL = EvaluateLevelEnum.一级;
} }
else if (dtSource.Rows[i][11].ToString().Trim() == "二级") else if (dtSource.Rows[i][11].ToString().Trim() == "较大风险")
{ {
item.EVALUATE_LEVEL = EvaluateLevelEnum.二级; item.EVALUATE_LEVEL = EvaluateLevelEnum.二级;
} }
else if (dtSource.Rows[i][11].ToString().Trim() == "三级") else if (dtSource.Rows[i][11].ToString().Trim() == "一般风险")
{ {
item.EVALUATE_LEVEL = EvaluateLevelEnum.三级; item.EVALUATE_LEVEL = EvaluateLevelEnum.三级;
} }
else if (dtSource.Rows[i][11].ToString().Trim() == "四级") else if (dtSource.Rows[i][11].ToString().Trim() == "低风险")
{ {
item.EVALUATE_LEVEL = EvaluateLevelEnum.四级; item.EVALUATE_LEVEL = EvaluateLevelEnum.四级;
} }

18
APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluationPlanController.cs
View File

@ -57,7 +57,7 @@ namespace APT.HM.WebApi.Controllers.Api
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
List<T_HM_EVALUATION_DETAIL_AREA> areas = new List<T_HM_EVALUATION_DETAIL_AREA>(); List<T_HM_EVALUATION_DETAIL_AREA> areas = new List<T_HM_EVALUATION_DETAIL_AREA>();
List<T_HM_EVALUATION_DETAIL_IDENTIFYING> identifyings = new List<T_HM_EVALUATION_DETAIL_IDENTIFYING>(); List<T_HM_EVALUATION_DETAIL_IDENTIFYING> identifyings = new List<T_HM_EVALUATION_DETAIL_IDENTIFYING>();
IEnumerable<T_PF_APPROVE_TEMP_DETAIL> teamLeaders = new List<T_PF_APPROVE_TEMP_DETAIL>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
if (Nav_Details.Count() == 0) if (Nav_Details.Count() == 0)
@ -100,6 +100,20 @@ namespace APT.HM.WebApi.Controllers.Api
{ {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID,entity.ID, "HM042_SHOWPRINT"); finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID,entity.ID, "HM042_SHOWPRINT");
} }
teamLeaders = GetEntities<T_PF_APPROVE_TEMP_DETAIL>(t => t.NAME == "风险管理小组组长" || t.NAME == "风险管理小组副组长", new BaseFilter(entity.ORG_ID));
if (teamLeaders != null && teamLeaders.Any())
{
var leader = teamLeaders.Where(t => t.NAME == "风险管理小组组长");
foreach (var leaderuser in leader)
{
leaderuser.DEFAULT_APPROVE_USER_ID = entity.GROUP_LEADER_ID;
}
var deputyLeader = teamLeaders.Where(t => t.NAME == "风险管理小组副组长");
foreach (var leaderuser in deputyLeader)
{
leaderuser.DEFAULT_APPROVE_USER_ID = entity.DEPUTY_GROUP_LEADER_ID;
}
}
} }
Nav_Details.ForEach(detail => Nav_Details.ForEach(detail =>
{ {
@ -130,6 +144,8 @@ namespace APT.HM.WebApi.Controllers.Api
AddEntityNoCommit(notice); AddEntityNoCommit(notice);
if (finishNotice != null) if (finishNotice != null)
UpdateEntityNoCommit(finishNotice, "NOTICE_STATUS", "TASK_DT", "MODIFIER_ID"); UpdateEntityNoCommit(finishNotice, "NOTICE_STATUS", "TASK_DT", "MODIFIER_ID");
if (teamLeaders != null)
BantchSaveEntityNoCommit(teamLeaders); //保存子表
}); });
return true; return true;
}); });

3
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)
@ -297,6 +297,7 @@ namespace APT.HM.WebApi.Controllers.Api
} }
allUsers.Add(recordUser); allUsers.Add(recordUser);
} }
allUsers= allUsers.DistinctBy(u => new { u.USER_ID, u.AREA_ID }).ToList();
} }
} }
//添加附件 //添加附件

1
APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs
View File

@ -358,6 +358,7 @@ namespace APT.HM.WebApi.Controllers.Api
} }
allUsers.Add(recordUser); allUsers.Add(recordUser);
} }
allUsers = allUsers.DistinctBy(u => new { u.USER_ID, u.AREA_ID }).ToList();
} }
//添加辨识对象 //添加辨识对象