wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、培训通知状态名称修改 签到完成 => 待培训 页面判断信息同步修改

Browse Source 
2、培训汇总 NUM3 三级安全教育取新的
This commit is contained in:
wyw 2026-08-05 13:34:25 +08:00
parent 84f475f027
commit 74457d0a1e
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APT.MS.Domain/Enums/SC/SEEnum.cs
View File

@ -105,7 +105,7 @@ namespace APT.MS.Domain.Enums
{ {
草稿 = 0, 草稿 = 0,
通知中 = 1, 通知中 = 1,
签到完成 = 2, 待培训 = 2,
审阅中 = 3, 审阅中 = 3,
归档 = 4, 归档 = 4,
} }

2
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
View File

@ -1927,7 +1927,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
BaseFilter baseFilter = new BaseFilter(orgId); 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" }; 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_SE_TRAIN_NOTIFY>(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_SE_TRAIN_NOTIFY>(t => (t.STATUS == SETrainNotifyStatus.通知中 || t.STATUS == SETrainNotifyStatus.待培训) && t.STATUS != SETrainNotifyStatus.归档 && t.TRAIN_START_TIME.Value < maxTime && t.CREATE_NOTIFY_RECORD == true, baseFilter).ToList();
#region 培训记录 #region 培训记录
if (notifys != null && notifys.Any() && notifys.Count() > 0) if (notifys != null && notifys.Any() && notifys.Count() > 0)

3
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs
View File

@ -1266,7 +1266,8 @@ namespace APT.SC.WebApi.Controllers.Api.BI
safeTrainData safeTrainData = new safeTrainData(); safeTrainData safeTrainData = new safeTrainData();
safeTrainData.NUM1 = 1; safeTrainData.NUM1 = 1;
safeTrainData.NUM2 = records.Count(); safeTrainData.NUM2 = records.Count();
safeTrainData.NUM3 = GetCount<T_SE_THREE_LEVEL_SAFE_EDU_CARD>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId())); //safeTrainData.NUM3 = GetCount<T_SE_THREE_LEVEL_SAFE_EDU_CARD>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId()));
safeTrainData.NUM3 = GetCount<T_SE_NEW_USERS>(t => t.IS_DELETED == false, new BaseFilter(filter.GetOrgId()));
safeTrainData.NUM4 = 13; safeTrainData.NUM4 = 13;
safeTrainData.NUM5 = 14; safeTrainData.NUM5 = 14;
safeTrainData.NUM6 = 15; safeTrainData.NUM6 = 15;

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/5SETTrainNotifyController.cs
View File

@ -369,7 +369,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
//没有触发培训通知 //没有触发培训通知
if (entity.CREATE_NOTIFY_RECORD) if (entity.CREATE_NOTIFY_RECORD)
{ {
entity.STATUS = SETrainNotifyStatus.签到完成; entity.STATUS = SETrainNotifyStatus.待培训;
} }
else else
{ {
@ -472,7 +472,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
//model = GetEntity<T_SE_TRAIN_NOTIFY>(entity.NOTIFY_ID); //model = GetEntity<T_SE_TRAIN_NOTIFY>(entity.NOTIFY_ID);
if (model.CREATE_NOTIFY_RECORD && model.STATUS != SETrainNotifyStatus.归档) if (model.CREATE_NOTIFY_RECORD && model.STATUS != SETrainNotifyStatus.归档)
{ {
model.STATUS = SETrainNotifyStatus.签到完成; model.STATUS = SETrainNotifyStatus.待培训;
} }
else else
{ {

4
APT.MicroApi/APT.SC.WebApi/Controllers/Api/WBController/4WBOutsourceTrainRecordController.cs
View File

@ -319,7 +319,7 @@ namespace APT.SC.WebApi.Controllers.Api.WB
if (!entity.IS_CREATE_TEST && entity.TRAIN_TYPE == "_2_") if (!entity.IS_CREATE_TEST && entity.TRAIN_TYPE == "_2_")
{ {
//线下 不要考试 //线下 不要考试
entity.STATUS = SETrainNotifyStatus.签到完成; entity.STATUS = SETrainNotifyStatus.待培训;
for (int i = 0; i < Nav_Users.Count; i++) for (int i = 0; i < Nav_Users.Count; i++)
{ {
if (!Nav_Users[i].SCORE.HasValue) if (!Nav_Users[i].SCORE.HasValue)
@ -706,7 +706,7 @@ namespace APT.SC.WebApi.Controllers.Api.WB
model = GetEntity<T_WB_OUTSOURCE_TRAIN_RECORD>(entity.ID.ToString(), "Nav_Parent.Nav_Project"); model = GetEntity<T_WB_OUTSOURCE_TRAIN_RECORD>(entity.ID.ToString(), "Nav_Parent.Nav_Project");
model.ONLINE_END_TIME = DateTime.Now; model.ONLINE_END_TIME = DateTime.Now;
model.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_FM_USER>(t => t.ID == model.Nav_Parent.USER_ID).NAME, DateTime.Now, DateTime.Now.AddDays(7), 1, "WB048"); task = NotificationTaskService.InsertUserNoticeTaskModel(model.Nav_Parent.Nav_Project.UNIT_NAME + "安全培训记录-分数", model.ID, orgId, (Guid)model.Nav_Parent.USER_ID, GetEntity<T_FM_USER>(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); var finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID, entity.ID);