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-04-24 09:58:53 +08:00
commit 38abfc114c
5 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs
View File

@ -52,6 +52,7 @@ namespace APT.BaseData.Services.DomainServices
var yearTrainPlanContent = new List<T_SE_YEAR_TRAIN_PLAN_CONTENT>(); var yearTrainPlanContent = new List<T_SE_YEAR_TRAIN_PLAN_CONTENT>();
var depPlan = GetEntity<T_SE_DEP_TRAIN_PLAN>(id, new string[] { "Nav_DepTrainPlanDetail.Nav_DepTrainPlanContent" }); var depPlan = GetEntity<T_SE_DEP_TRAIN_PLAN>(id, new string[] { "Nav_DepTrainPlanDetail.Nav_DepTrainPlanContent" });
var yearTrainPlan = GetEntity<T_SE_YEAR_TRAIN_PLAN>(t => t.PLAN_YEAR == depPlan.PLAN_YEAR); var yearTrainPlan = GetEntity<T_SE_YEAR_TRAIN_PLAN>(t => t.PLAN_YEAR == depPlan.PLAN_YEAR);
var sendNotice = new T_FM_NOTIFICATION_TASK();
var addyearTrainPlan = false; var addyearTrainPlan = false;
if (yearTrainPlan == null) if (yearTrainPlan == null)
{ {
@ -92,6 +93,30 @@ namespace APT.BaseData.Services.DomainServices
yearTrainPlanContent.Add(c); yearTrainPlanContent.Add(c);
}); });
}); });
var orgId = yearTrainPlan.ORG_ID;
var isFinishDep = GetEntities<T_SE_DEP_TRAIN_PLAN>(t => t.PLAN_YEAR == yearTrainPlan.PLAN_YEAR&&t.ID!=model.ID, new BaseFilter(orgId));
var isFinished = isFinishDep.Count(t => t.STATUS != PFStandardStatus.Archived);
if (isFinished == 0)
{
var user = GetEntity<T_FM_USER>(e => e.Nav_ApproveRole.NAME == "安环部负责人" && e.ENABLE_STATUS == 0);
if (user == null)
{
user = GetEntity<T_FM_USER>(e => e.Nav_ApproveRole.NAME == "安环部安全员" && e.ENABLE_STATUS == 0);
}
yearTrainPlan.LAUNCH_DEPARTMENT_ID = user.DEPARTMENT_ID;
yearTrainPlan.LAUNCH_TIME = DateTime.Now;
yearTrainPlan.LAUNCH_USER_ID = user.ID;
yearTrainPlan.STATUS = PFStandardStatus.Sign;
yearTrainPlan.END_TIME = Convert.ToDateTime(DateTime.Now.ToString("D").ToString());
if (user != null)
{
sendNotice = NotificationTaskService.InsertUserNoticeTaskModel(yearTrainPlan.PLAN_YEAR + "年度培训计划", yearTrainPlan.ID, orgId, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddDays(15), 0, "SE012");
}
else
{
throw new Exception("未找到安环部负责人!");
}
}
UnifiedCommit(() => UnifiedCommit(() =>
{ {
UpdateEntityNoCommit(model); UpdateEntityNoCommit(model);
@ -101,6 +126,8 @@ namespace APT.BaseData.Services.DomainServices
BantchSaveEntityNoCommit(yearTrainPlanDetail); BantchSaveEntityNoCommit(yearTrainPlanDetail);
if (yearTrainPlanDetail != null && yearTrainPlanDetail.Any()) if (yearTrainPlanDetail != null && yearTrainPlanDetail.Any())
BantchSaveEntityNoCommit(yearTrainPlanContent); BantchSaveEntityNoCommit(yearTrainPlanContent);
if (sendNotice != null)
AddEntityNoCommit(sendNotice);
}); });
return true; return true;
} }

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

@ -98,7 +98,7 @@ namespace APT.HM.WebApi.Controllers.Api
DateTime.Parse(DateTime.Now.AddDays(1).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM042_SHOWPRINT"); DateTime.Parse(DateTime.Now.AddDays(1).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM042_SHOWPRINT");
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID,entity.ID); finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID,entity.ID, "HM042_SHOWPRINT");
} }
} }
Nav_Details.ForEach(detail => Nav_Details.ForEach(detail =>

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

@ -145,6 +145,8 @@ namespace APT.HM.WebApi.Controllers.Api
entity.COMPLETE_DATE = null; entity.COMPLETE_DATE = null;
entity.IS_PUBLISH = (int)FOPreMeetingStatusEnum.草稿; entity.IS_PUBLISH = (int)FOPreMeetingStatusEnum.草稿;
entity.Nav_CreateUser = null; entity.Nav_CreateUser = null;
entity.COMPLETE_DATE = DateTime.Now;
entity.ORG_ID = entity.ORG_ID == null?APT.Infrastructure.Api.AppContext.CurrentSession.OrgId: entity.ORG_ID;
if (entity.Nav_CreateUser != null && entity.Nav_CreateUser.Nav_Department != null) if (entity.Nav_CreateUser != null && entity.Nav_CreateUser.Nav_Department != null)
entity.DEPARTMENT_ID = entity.Nav_CreateUser.Nav_Department.ID; entity.DEPARTMENT_ID = entity.Nav_CreateUser.Nav_Department.ID;
else else

2
SQL/删除/delete se.sql
View File

@ -16,10 +16,8 @@ delete T_SE_YEAR_TRAIN_PLAN
delete T_SE_DEP_TRAIN_PLAN_CONTENT delete T_SE_DEP_TRAIN_PLAN_CONTENT
delete T_SE_DEP_TRAIN_PLAN_DETAIL delete T_SE_DEP_TRAIN_PLAN_DETAIL
delete T_SE_DEP_TRAIN_PLAN delete T_SE_DEP_TRAIN_PLAN
delete T_SE_TRAIN_RECORD_LEAVEUSER
delete T_SE_TRAIN_RECORD_USER delete T_SE_TRAIN_RECORD_USER
delete T_SE_TRAIN_RECORD_PAPER delete T_SE_TRAIN_RECORD_PAPER
delete T_SE_TRAIN_RECORD_MSUSER
delete T_SE_TRAIN_RECORD_FILE delete T_SE_TRAIN_RECORD_FILE
delete T_SE_TRAIN_RECORD delete T_SE_TRAIN_RECORD
delete T_SE_TRAIN_NOTIFY_PERSONS delete T_SE_TRAIN_NOTIFY_PERSONS

52
SQL/删除/删除风险管理数据表.sql
View File

@ -1,23 +1,23 @@
/*2风险评价计划发布*/ /*2风险评价计划发布*/
DELETE T_HM_NOTICE_RELEASE_DEPARTMENT; DELETE T_HM_NOTICE_RELEASE_DEPARTMENT
DELETE T_HM_NOTICE_RELEASE_FILE; DELETE T_HM_NOTICE_RELEASE_FILE
DELETE T_HM_NOTICE_RELEASE; DELETE T_HM_NOTICE_RELEASE
/*5危险源/风险辨识记录表*/ /*5危险源/风险辨识记录表*/
DELETE T_HM_RISK_RECORD_FILE; DELETE T_HM_RISK_RECORD_FILE
DELETE T_HM_RISK_RECORD_IDENTIFYING; DELETE T_HM_RISK_RECORD_IDENTIFYING
DELETE T_HM_RISK_RECORD_USER; DELETE T_HM_RISK_RECORD_USER
DELETE T_HM_RISK_RECORD_DETAIL_WORKDUTY; DELETE T_HM_RISK_RECORD_DETAIL_WORKDUTY
DELETE T_HM_RISK_RECORD_DETAIL_EQUIPMENT; DELETE T_HM_RISK_RECORD_DETAIL_EQUIPMENT
DELETE T_HM_RISK_RECORD_DETAIL_FACILITIES; DELETE T_HM_RISK_RECORD_DETAIL_FACILITIES
DELETE T_HM_RISK_RECORD_DETAIL; DELETE T_HM_RISK_RECORD_DETAIL
DELETE T_HM_RISK_RECORD; DELETE T_HM_RISK_RECORD
/*4危险源/风险辨识任务*/ /*4危险源/风险辨识任务*/
DELETE T_HM_RISK_TASK_IDENTIFYING; DELETE T_HM_RISK_TASK_IDENTIFYING
DELETE T_HM_RISK_TASK_USER; DELETE T_HM_RISK_TASK_USER
DELETE T_HM_RISK_TASK_FILE; DELETE T_HM_RISK_TASK_FILE
DELETE T_HM_RISK_TASK_DETAIL; DELETE T_HM_RISK_TASK_DETAIL
DELETE T_HM_RISK_TASK_AREA DELETE T_HM_RISK_TASK_AREA
DELETE T_HM_RISK_TASK; DELETE T_HM_RISK_TASK
/*职业危辨识任务*/ /*职业危辨识任务*/
delete T_HM_HAZARD_TASK_DETAIL_IDENTIFYING delete T_HM_HAZARD_TASK_DETAIL_IDENTIFYING
delete T_HM_HAZARD_TASK_DETAIL_USER delete T_HM_HAZARD_TASK_DETAIL_USER
@ -38,17 +38,17 @@ DELETE T_HM_EVALUATE_RESULT_HAZARD_EDUCATION_MEASURES
DELETE T_HM_EVALUATE_RESULT_HAZARD_EMERGENCY_MEASURES DELETE T_HM_EVALUATE_RESULT_HAZARD_EMERGENCY_MEASURES
DELETE T_HM_EVALUATE_RESULT_HAZARD DELETE T_HM_EVALUATE_RESULT_HAZARD
DELETE T_HM_EVALUATE_RESULT_RISK_WORKDUTY; DELETE T_HM_EVALUATE_RESULT_RISK_WORKDUTY
DELETE T_HM_EVALUATE_RESULT_RISK_EQUIPMENT; DELETE T_HM_EVALUATE_RESULT_RISK_EQUIPMENT
DELETE T_HM_EVALUATE_RESULT_RISK_FACILITIES; DELETE T_HM_EVALUATE_RESULT_RISK_FACILITIES
DELETE T_HM_EVALUATE_RESULT_RISK_INDIVIDUAL_MEASURES; DELETE T_HM_EVALUATE_RESULT_RISK_INDIVIDUAL_MEASURES
DELETE T_HM_EVALUATE_RESULT_RISK_ENGINEERING_MEASURES; DELETE T_HM_EVALUATE_RESULT_RISK_ENGINEERING_MEASURES
DELETE T_HM_EVALUATE_RESULT_RISK_MANAGEMENT_MEASURES; DELETE T_HM_EVALUATE_RESULT_RISK_MANAGEMENT_MEASURES
DELETE T_HM_EVALUATE_RESULT_RISK_EDUCATION_MEASURES; DELETE T_HM_EVALUATE_RESULT_RISK_EDUCATION_MEASURES
DELETE T_HM_EVALUATE_RESULT_RISK_EMERGENCY_MEASURES; DELETE T_HM_EVALUATE_RESULT_RISK_EMERGENCY_MEASURES
DELETE T_HM_EVALUATE_RESULT_RISK; DELETE T_HM_EVALUATE_RESULT_RISK
DELETE T_HM_EVALUATE_RESULT; DELETE T_HM_EVALUATE_RESULT
/*1年度风险评价计划审核表*/ /*1年度风险评价计划审核表*/
delete T_HM_EVALUATION_FILE delete T_HM_EVALUATION_FILE
DELETE T_HM_EVALUATION_DETAIL_AREA DELETE T_HM_EVALUATION_DETAIL_AREA