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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
何美荣 2026-05-12 15:33:44 +08:00
commit d81b522a37
2 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1939,53 +1939,63 @@ namespace APT.PP.WebApi.Controllers.Api.PP
var allSendUserNames = new List<string>(); var allSendUserNames = new List<string>();
var allSendTitles = new List<string>(); var allSendTitles = new List<string>();
var allSendDataIds = new List<Guid>(); var allSendDataIds = new List<Guid>();
SETrainNotifyStatus STATUS = SETrainNotifyStatus.草稿;
foreach (var notify in notifys) foreach (var notify in notifys)
{ {
notify.STATUS = SETrainNotifyStatus.归档; STATUS = notify.STATUS;
var record = new T_SE_TRAIN_RECORD try
{ {
ID = Guid.NewGuid(), notify.STATUS = SETrainNotifyStatus.归档;
ORG_ID = orgId, var record = new T_SE_TRAIN_RECORD
NOTIFY_ID = notify.ID,
STATUS = SETrainRecordStatus.草稿,
};
foreach (var user in notify.Nav_TrainUserList)
{
var joinUser = new T_SE_TRAIN_RECORD_USER
{ {
ID = Guid.NewGuid(), ID = Guid.NewGuid(),
ORG_ID = orgId, ORG_ID = orgId,
RECORD_ID = record.ID, NOTIFY_ID = notify.ID,
USER_ID = user.USER_ID, STATUS = SETrainRecordStatus.草稿,
DEPARTMENT_NAME = user.Nav_User.Nav_Department.NAME,
POST_NAME = user.Nav_User.Nav_Person.Nav_Post.NAME
}; };
if (user.IS_LEAVE == SETrainYesNoEnum.请假) foreach (var user in notify.Nav_TrainUserList)
{ {
joinUser.STATUS = SETrainRecordUserStatusEnum.请假; var joinUser = new T_SE_TRAIN_RECORD_USER
{
ID = Guid.NewGuid(),
ORG_ID = orgId,
RECORD_ID = record.ID,
USER_ID = user.USER_ID,
DEPARTMENT_NAME = user.Nav_User.Nav_Department.NAME,
POST_NAME = user.Nav_User.Nav_Person.Nav_Post.NAME
};
if (user.IS_LEAVE == SETrainYesNoEnum.请假)
{
joinUser.STATUS = SETrainRecordUserStatusEnum.请假;
}
else
{
joinUser.STATUS = SETrainRecordUserStatusEnum.参与;
}
joinUsers.Add(joinUser);
} }
else foreach (var file in notify.Nav_Files)
{ {
joinUser.STATUS = SETrainRecordUserStatusEnum.参与; var recordFile = new T_SE_TRAIN_RECORD_FILE
{
ID = Guid.NewGuid(),
ORG_ID = orgId,
RECORD_ID = record.ID,
IMG_FILE_ID = file.IMG_FILE_ID
};
files.Add(recordFile);
} }
joinUsers.Add(joinUser); TrainRecords.Add(record);
allSendTitles.Add("培训记录-" + notify.NAME);
allSendDataIds.Add(record.ID);
allSendUserIds.Add((Guid)notify.RECORD_USER_ID);
allSendUserNames.Add(notify.Nav_RecordUser.NAME);
} }
foreach (var file in notify.Nav_Files) catch
{ {
var recordFile = new T_SE_TRAIN_RECORD_FILE notify.STATUS = STATUS;
{
ID = Guid.NewGuid(),
ORG_ID = orgId,
RECORD_ID = record.ID,
IMG_FILE_ID = file.IMG_FILE_ID
};
files.Add(recordFile);
} }
TrainRecords.Add(record);
allSendTitles.Add("培训记录-" + notify.NAME);
allSendDataIds.Add(record.ID);
allSendUserIds.Add((Guid)notify.RECORD_USER_ID);
allSendUserNames.Add(notify.Nav_RecordUser.NAME);
notify.Nav_LaunchUser = null; notify.Nav_LaunchUser = null;
notify.Nav_RecordUser = null; notify.Nav_RecordUser = null;
}; };

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

@ -131,7 +131,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
} }
} }
} }
entity.STATUS = PFStandardStatus.Approving;
MFlowPermitService.InsertApprove(null, "SE071", ((int)entity.TYPE).ToString(), entity.ID, "SE071_SHOWPRINT", entity.TaskID, true, () => MFlowPermitService.InsertApprove(null, "SE071", ((int)entity.TYPE).ToString(), entity.ID, "SE071_SHOWPRINT", entity.TaskID, true, () =>
{ {
UpdateEntityNoCommit(entity); UpdateEntityNoCommit(entity);