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

Compare commits

base: wyw:87ddf3871f4a04dda87d6e4e72997cc86818ecc1
Branches Tags
wyw:master
..
compare: wyw:ad99885e77237922ab5cb23649be568c692f4276
Branches Tags
wyw:master

No commits in common. "87ddf3871f4a04dda87d6e4e72997cc86818ecc1" and "ad99885e77237922ab5cb23649be568c692f4276" have entirely different histories.
87ddf3871f ... ad99885e77

1 changed files with 33 additions and 43 deletions
Show Stats Expand all files Collapse all files

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

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