From 4e3dadddc5c88b335da93616a8de116b5030e902 Mon Sep 17 00:00:00 2001 From: wjn Date: Thu, 18 Apr 2024 15:42:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.HM.WebApi/Controllers/Api/EvaluationPlanController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluationPlanController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluationPlanController.cs index 52c0a63..340e9a6 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluationPlanController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluationPlanController.cs @@ -98,7 +98,7 @@ namespace APT.HM.WebApi.Controllers.Api DateTime.Parse(DateTime.Now.AddDays(1).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM042_SHOWPRINT"); 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 => From bf633ebe6709a28b4e1ce5b05d58f415ab518629 Mon Sep 17 00:00:00 2001 From: wjn Date: Mon, 22 Apr 2024 09:31:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=9F=B9=E8=AE=AD?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E5=90=8E=E5=B0=B1=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackSEService.cs | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs index 5265868..37725e7 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs @@ -52,6 +52,7 @@ namespace APT.BaseData.Services.DomainServices var yearTrainPlanContent = new List(); var depPlan = GetEntity(id, new string[] { "Nav_DepTrainPlanDetail.Nav_DepTrainPlanContent" }); var yearTrainPlan = GetEntity(t => t.PLAN_YEAR == depPlan.PLAN_YEAR); + var sendNotice = new T_FM_NOTIFICATION_TASK(); var addyearTrainPlan = false; if (yearTrainPlan == null) { @@ -92,6 +93,30 @@ namespace APT.BaseData.Services.DomainServices yearTrainPlanContent.Add(c); }); }); + var orgId = yearTrainPlan.ORG_ID; + var isFinishDep = GetEntities(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(e => e.Nav_ApproveRole.NAME == "安环部负责人" && e.ENABLE_STATUS == 0); + if (user == null) + { + user = GetEntity(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(() => { UpdateEntityNoCommit(model); @@ -101,6 +126,8 @@ namespace APT.BaseData.Services.DomainServices BantchSaveEntityNoCommit(yearTrainPlanDetail); if (yearTrainPlanDetail != null && yearTrainPlanDetail.Any()) BantchSaveEntityNoCommit(yearTrainPlanContent); + if (sendNotice != null) + AddEntityNoCommit(sendNotice); }); return true; } From 9992ed98d5b26155020551cf23937d3f532e5a30 Mon Sep 17 00:00:00 2001 From: wjn Date: Tue, 23 Apr 2024 11:23:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SQL/删除/delete se.sql | 2 - SQL/删除/删除风险管理数据表.sql | 52 +++++++++++----------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/SQL/删除/delete se.sql b/SQL/删除/delete se.sql index b84c0b5..5fbbe8b 100644 --- a/SQL/删除/delete se.sql +++ b/SQL/删除/delete se.sql @@ -16,10 +16,8 @@ delete T_SE_YEAR_TRAIN_PLAN delete T_SE_DEP_TRAIN_PLAN_CONTENT delete T_SE_DEP_TRAIN_PLAN_DETAIL delete T_SE_DEP_TRAIN_PLAN -delete T_SE_TRAIN_RECORD_LEAVEUSER delete T_SE_TRAIN_RECORD_USER delete T_SE_TRAIN_RECORD_PAPER -delete T_SE_TRAIN_RECORD_MSUSER delete T_SE_TRAIN_RECORD_FILE delete T_SE_TRAIN_RECORD delete T_SE_TRAIN_NOTIFY_PERSONS diff --git a/SQL/删除/删除风险管理数据表.sql b/SQL/删除/删除风险管理数据表.sql index 35cb6cc..8e9cdc8 100644 --- a/SQL/删除/删除风险管理数据表.sql +++ b/SQL/删除/删除风险管理数据表.sql @@ -1,23 +1,23 @@ /*2风险评价计划发布*/ -DELETE T_HM_NOTICE_RELEASE_DEPARTMENT; -DELETE T_HM_NOTICE_RELEASE_FILE; -DELETE T_HM_NOTICE_RELEASE; +DELETE T_HM_NOTICE_RELEASE_DEPARTMENT +DELETE T_HM_NOTICE_RELEASE_FILE +DELETE T_HM_NOTICE_RELEASE /*5危险源/风险辨识记录表*/ -DELETE T_HM_RISK_RECORD_FILE; -DELETE T_HM_RISK_RECORD_IDENTIFYING; -DELETE T_HM_RISK_RECORD_USER; -DELETE T_HM_RISK_RECORD_DETAIL_WORKDUTY; -DELETE T_HM_RISK_RECORD_DETAIL_EQUIPMENT; -DELETE T_HM_RISK_RECORD_DETAIL_FACILITIES; -DELETE T_HM_RISK_RECORD_DETAIL; -DELETE T_HM_RISK_RECORD; +DELETE T_HM_RISK_RECORD_FILE +DELETE T_HM_RISK_RECORD_IDENTIFYING +DELETE T_HM_RISK_RECORD_USER +DELETE T_HM_RISK_RECORD_DETAIL_WORKDUTY +DELETE T_HM_RISK_RECORD_DETAIL_EQUIPMENT +DELETE T_HM_RISK_RECORD_DETAIL_FACILITIES +DELETE T_HM_RISK_RECORD_DETAIL +DELETE T_HM_RISK_RECORD /*4危险源/风险辨识任务*/ -DELETE T_HM_RISK_TASK_IDENTIFYING; -DELETE T_HM_RISK_TASK_USER; -DELETE T_HM_RISK_TASK_FILE; -DELETE T_HM_RISK_TASK_DETAIL; +DELETE T_HM_RISK_TASK_IDENTIFYING +DELETE T_HM_RISK_TASK_USER +DELETE T_HM_RISK_TASK_FILE +DELETE T_HM_RISK_TASK_DETAIL 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_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 -DELETE T_HM_EVALUATE_RESULT_RISK_WORKDUTY; -DELETE T_HM_EVALUATE_RESULT_RISK_EQUIPMENT; -DELETE T_HM_EVALUATE_RESULT_RISK_FACILITIES; -DELETE T_HM_EVALUATE_RESULT_RISK_INDIVIDUAL_MEASURES; -DELETE T_HM_EVALUATE_RESULT_RISK_ENGINEERING_MEASURES; -DELETE T_HM_EVALUATE_RESULT_RISK_MANAGEMENT_MEASURES; -DELETE T_HM_EVALUATE_RESULT_RISK_EDUCATION_MEASURES; -DELETE T_HM_EVALUATE_RESULT_RISK_EMERGENCY_MEASURES; -DELETE T_HM_EVALUATE_RESULT_RISK; +DELETE T_HM_EVALUATE_RESULT_RISK_WORKDUTY +DELETE T_HM_EVALUATE_RESULT_RISK_EQUIPMENT +DELETE T_HM_EVALUATE_RESULT_RISK_FACILITIES +DELETE T_HM_EVALUATE_RESULT_RISK_INDIVIDUAL_MEASURES +DELETE T_HM_EVALUATE_RESULT_RISK_ENGINEERING_MEASURES +DELETE T_HM_EVALUATE_RESULT_RISK_MANAGEMENT_MEASURES +DELETE T_HM_EVALUATE_RESULT_RISK_EDUCATION_MEASURES +DELETE T_HM_EVALUATE_RESULT_RISK_EMERGENCY_MEASURES +DELETE T_HM_EVALUATE_RESULT_RISK -DELETE T_HM_EVALUATE_RESULT; +DELETE T_HM_EVALUATE_RESULT /*1年度风险评价计划审核表*/ delete T_HM_EVALUATION_FILE DELETE T_HM_EVALUATION_DETAIL_AREA From 8825054c320edf349aaf8966df241ed10622b866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com> Date: Wed, 24 Apr 2024 08:53:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs index 1d3fdc0..ad18ba1 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs @@ -145,6 +145,8 @@ namespace APT.HM.WebApi.Controllers.Api entity.COMPLETE_DATE = null; entity.IS_PUBLISH = (int)FOPreMeetingStatusEnum.草稿; 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) entity.DEPARTMENT_ID = entity.Nav_CreateUser.Nav_Department.ID; else