From 74457d0a1eab8288c2c45683579336713a464733 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 5 Aug 2026 13:34:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9F=B9=E8=AE=AD=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=20=20?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=AE=8C=E6=88=90=20=20=3D>=20=E5=BE=85?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=20=20=20=E9=A1=B5=E9=9D=A2=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9=202?= =?UTF-8?q?=E3=80=81=E5=9F=B9=E8=AE=AD=E6=B1=87=E6=80=BB=20NUM3=20?= =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2=E5=8F=96?= =?UTF-8?q?=E6=96=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APT.MS.Domain/Enums/SC/SEEnum.cs | 2 +- APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs | 2 +- .../Controllers/Api/BIController/BIController.cs | 3 ++- .../Controllers/Api/SEController/5SETTrainNotifyController.cs | 4 ++-- .../Api/WBController/4WBOutsourceTrainRecordController.cs | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/APT.MS.Domain/Enums/SC/SEEnum.cs b/APT.MS.Domain/Enums/SC/SEEnum.cs index b34075d..6efac87 100644 --- a/APT.MS.Domain/Enums/SC/SEEnum.cs +++ b/APT.MS.Domain/Enums/SC/SEEnum.cs @@ -105,7 +105,7 @@ namespace APT.MS.Domain.Enums { 草稿 = 0, 通知中 = 1, - 签到完成 = 2, + 待培训 = 2, 审阅中 = 3, 归档 = 4, } diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs index afff991..b6df315 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs @@ -1927,7 +1927,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP BaseFilter baseFilter = new BaseFilter(orgId); baseFilter.Include = new string[] { "Nav_RecordUser", "Nav_TrainUserList.Nav_User.Nav_Department", "Nav_TrainUserList.Nav_User.Nav_Person.Nav_Post", "Nav_Files" }; - var notifys = GetEntities(t => (t.STATUS == SETrainNotifyStatus.通知中 || t.STATUS == SETrainNotifyStatus.签到完成) && t.STATUS != SETrainNotifyStatus.归档 && t.TRAIN_START_TIME.Value < maxTime && t.CREATE_NOTIFY_RECORD == true, baseFilter).ToList(); + var notifys = GetEntities(t => (t.STATUS == SETrainNotifyStatus.通知中 || t.STATUS == SETrainNotifyStatus.待培训) && t.STATUS != SETrainNotifyStatus.归档 && t.TRAIN_START_TIME.Value < maxTime && t.CREATE_NOTIFY_RECORD == true, baseFilter).ToList(); #region 培训记录 if (notifys != null && notifys.Any() && notifys.Count() > 0) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs index 43090fb..4165156 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs @@ -1266,7 +1266,8 @@ namespace APT.SC.WebApi.Controllers.Api.BI safeTrainData safeTrainData = new safeTrainData(); safeTrainData.NUM1 = 1; safeTrainData.NUM2 = records.Count(); - safeTrainData.NUM3 = GetCount(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); + //safeTrainData.NUM3 = GetCount(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); + safeTrainData.NUM3 = GetCount(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); safeTrainData.NUM4 = 13; safeTrainData.NUM5 = 14; safeTrainData.NUM6 = 15; diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs index d0c335a..5bda236 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs @@ -369,7 +369,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE //没有触发培训通知 if (entity.CREATE_NOTIFY_RECORD) { - entity.STATUS = SETrainNotifyStatus.签到完成; + entity.STATUS = SETrainNotifyStatus.待培训; } else { @@ -472,7 +472,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE //model = GetEntity(entity.NOTIFY_ID); if (model.CREATE_NOTIFY_RECORD && model.STATUS != SETrainNotifyStatus.归档) { - model.STATUS = SETrainNotifyStatus.签到完成; + model.STATUS = SETrainNotifyStatus.待培训; } else { diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/WBController/4WBOutsourceTrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/WBController/4WBOutsourceTrainRecordController.cs index 7785395..9141e6c 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/WBController/4WBOutsourceTrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/WBController/4WBOutsourceTrainRecordController.cs @@ -319,7 +319,7 @@ namespace APT.SC.WebApi.Controllers.Api.WB if (!entity.IS_CREATE_TEST && entity.TRAIN_TYPE == "_2_") { //线下 不要考试 - entity.STATUS = SETrainNotifyStatus.签到完成; + entity.STATUS = SETrainNotifyStatus.待培训; for (int i = 0; i < Nav_Users.Count; i++) { if (!Nav_Users[i].SCORE.HasValue) @@ -706,7 +706,7 @@ namespace APT.SC.WebApi.Controllers.Api.WB model = GetEntity(entity.ID.ToString(), "Nav_Parent.Nav_Project"); model.ONLINE_END_TIME = DateTime.Now; model.END_TIME = DateTime.Now; - model.STATUS = SETrainNotifyStatus.签到完成; + model.STATUS = SETrainNotifyStatus.待培训; task = NotificationTaskService.InsertUserNoticeTaskModel(model.Nav_Parent.Nav_Project.UNIT_NAME + "安全培训记录-分数", model.ID, orgId, (Guid)model.Nav_Parent.USER_ID, GetEntity(t => t.ID == model.Nav_Parent.USER_ID).NAME, DateTime.Now, DateTime.Now.AddDays(7), 1, "WB048"); } var finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID);