diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs index 71763b0..15fb08e 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs @@ -39,7 +39,7 @@ namespace APT.PF.WebApiControllers.Api.PF [Route("api/PF/Login")] public class LoginController : CommonApiController { - private const string SUPER_PASSWORD = "@MH!20220101"; + private const string SUPER_PASSWORD = "@Ql!26qwe"; [HttpGet, Route("InitDataBase")] public JsonActionResult InitDataBase() { diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs index 5223da1..29a91e8 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/TokenController.cs @@ -37,7 +37,7 @@ namespace APT.PF.WebApi.Controllers.Api.FM [Route("api/Token")] public class TokenController : Controller { - private const string SUPER_PASSWORD = "@MH!20220101"; + private const string SUPER_PASSWORD = "@Ql!26qwe"; [HttpPost, Route("Gen")] public async Task Gen([FromBody] TokenRequest request) { diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs index 08f4a6b..0960c77 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -219,7 +219,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE { if (item.IS_DELETED) continue; - if (!item.EXAMINATION_RESULTS.HasValue) + if (item.STATUS == SETrainRecordUserStatusEnum.参与 && !item.EXAMINATION_RESULTS.HasValue) throw new Exception("行" + index + " 请完善考核结果！"); index++; } @@ -288,9 +288,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE } var record = GetEntity(papers[0].RECORD_ID); - if (record!=null) + if (record != null) { - STATUS=record.STATUS; + STATUS = record.STATUS; } } @@ -1128,7 +1128,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE { return SafeExecute(() => { - var data = GetEntity(filter.Keyword, new string[] { "Nav_Notify.Nav_TrainUserList.Nav_User", "Nav_Notify.Nav_TrainContentList", "Nav_Notify.Nav_Files", "Nav_Notify.Nav_LaunchUser", "Nav_Users.Nav_User" }); + var data = GetEntity(filter.Keyword, new string[] { "Nav_Notify.Nav_TrainUserList.Nav_User", "Nav_Notify.Nav_TrainContentList", "Nav_Notify.Nav_Files", "Nav_Notify.Nav_LaunchUser", "Nav_Users.Nav_User", "Nav_Notify.Nav_ListCour" }); if (data == null) { throw new Exception("未查到相应数据"); @@ -1138,7 +1138,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE List transferNotifyContents = new List(); List transferNotifyFiles = new List(); List sendNoticeTask = new List(); - + List ListCour = null; if (data.STATUS == SETrainRecordStatus.审阅中) { data.STATUS = SETrainRecordStatus.归档; @@ -1147,7 +1147,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE var Nav_TrainUserList = data.Nav_Notify.Nav_TrainUserList; var Nav_TrainContentList = data.Nav_Notify.Nav_TrainContentList; var Nav_Files = data.Nav_Notify.Nav_Files; - + var Nav_ListCour = data.Nav_Notify.Nav_ListCour; var transferUsers = Nav_TrainUserList.Where(t => t.IS_DELETED == false && t.TRANSFER_TRAINING == true).ToList(); foreach (var item in transferUsers) @@ -1169,6 +1169,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE CREATE_NOTIFY_RECORD = true, ORIGINAL_NOTIFY_ID = item.Nav_Notify.ID, ORG_ID = item.ORG_ID, + TRAINTYPE = item.Nav_Notify.TRAINTYPE, + IN_OUT = item.Nav_Notify.IN_OUT, + PLANDETAILID = item.Nav_Notify.PLANDETAILID, + TRAIN_DEPARTMENT_ID = item.Nav_Notify.TRAIN_DEPARTMENT_ID, + NEED_EVALUATION = item.Nav_Notify.NEED_EVALUATION, }; if (item.Nav_Notify.LEVEL == FMDepartmentType.Company) { @@ -1206,6 +1211,22 @@ namespace APT.SC.WebApi.Controllers.Api.SE transferNotifyFiles.Add(notifyfile); } } + if (Nav_ListCour != null && Nav_ListCour.Count() > 0) + { + if (ListCour == null) + ListCour = new List(); + foreach (var itemC in Nav_ListCour) + { + ListCour.Add(new T_SE_TRAIN_NOTIFY_COURSEWEARLIBRARY() + { + ID = Guid.NewGuid(), + ORG_ID = itemC.ORG_ID, + NOTIFY_ID = newNotify.ID, + COURSEWEARLIBRARY_ID = itemC.COURSEWEARLIBRARY_ID, + NUM = itemC.NUM + }); + } + } sendNoticeTask.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训通知-" + newNotify.NAME + "-转训", newNotify.ID, newNotify.ORG_ID, item.USER_ID, item.Nav_User.NAME, DateTime.Now, DateTime.Now.AddDays(1), (int)FMNoticeTypeEnum.消息, "SE014")); } //20231113触发给缺席人员 @@ -1268,6 +1289,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE BantchAddEntityNoCommit(transferNotifyFiles); if (sendNoticeTask != null && sendNoticeTask.Any()) BantchAddEntityNoCommit(sendNoticeTask); + if (ListCour != null && ListCour.Any()) + BantchSaveEntityNoCommit(ListCour); }); return true; diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs index d09cc69..d6a1ad0 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SECoursewearlibrary.cs @@ -595,13 +595,13 @@ namespace APT.SE.WebApi.Controllers.Api check = listDataAllCheck.FirstOrDefault(e => e.NAME == mainTable.NAME && e.TYPE == mainTable.TYPE); if (check != null) { - listRepeatDataIndex.Add((i + rowIndex).ToString()); + listRepeatDataIndex.Add((i + 1 + rowIndex).ToString()); listNameTypeError.Add(mainTable.NAME + "" + testType); } check = mainTables.FirstOrDefault(e => e.NAME == mainTable.NAME && e.TYPE == mainTable.TYPE); if (check != null) { - listRepeatExcelIndex.Add((i + rowIndex).ToString()); + listRepeatExcelIndex.Add((i + 1 + rowIndex).ToString()); listNameTypeEError.Add(mainTable.NAME + "" + testType); } diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs index f8d226e..ff788d1 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs @@ -425,13 +425,13 @@ namespace APT.SE.WebApi.Controllers.Api check = listDataAllCheck.FirstOrDefault(e => e.NAME == mainTable.NAME && e.TYPE == mainTable.TYPE); if (check != null) { - listRepeatDataIndex.Add((i + rowIndex).ToString()); + listRepeatDataIndex.Add((i + 1 + rowIndex).ToString()); listNameTypeError.Add(mainTable.NAME + "" + testType); } check = mainTables.FirstOrDefault(e => e.NAME == mainTable.NAME && e.TYPE == mainTable.TYPE); if (check != null) { - listRepeatExcelIndex.Add((i + rowIndex).ToString()); + listRepeatExcelIndex.Add((i + 1 + rowIndex).ToString()); listNameTypeEError.Add(mainTable.NAME + "" + testType); }