diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs index ae4864f..f6b3e36 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs @@ -373,7 +373,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP return SafeExecute(() => { var riskFilter = new BaseFilter(filter.GetOrgId()); - var trainRecords = GetEntities(t => t.TRAIN_MODEL == "笔试" && t.TRAIN_SCORE == 0 && t.CREATE_TIME > DateTime.Now.AddMonths(-12), riskFilter); + var trainRecords = GetEntities(t => t.TRAIN_MODEL == "线上考核" && t.TRAIN_SCORE == 0 && t.CREATE_TIME > DateTime.Now.AddMonths(-12), riskFilter); List newList = new List(); foreach (var item in trainRecords) { @@ -435,11 +435,15 @@ namespace APT.PP.WebApi.Controllers.Api.PP newRecord.CLASS_NAME = item.Nav_Record.Nav_Notify.NAME; newRecord.START_TIME = (DateTime)item.Nav_Record.Nav_Notify.TRAIN_START_TIME; newRecord.END_TIME = (DateTime)item.Nav_Record.Nav_Notify.TRAIN_END_TIME; - newRecord.TRAIN_TYPE = changeEnum(item.Nav_Record.Nav_Notify.TRAIN_MODEL); - newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS; + //newRecord.TRAIN_TYPE = changeEnum(item.Nav_Record.Nav_Notify.TRAIN_MODEL); //newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME; - newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.CHECKTYPE.GetDescription(); - + try + { + newRecord.TRAIN_TYPE = item.Nav_Record.Nav_Notify.TRAINTYPE.GetDescription(); + newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.CHECKTYPE.GetDescription(); + } + catch { } + newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS; newRecord.ORG_ID = filter.GetOrgId(); newRecord.RECORD_ID = item.RECORD_ID; newRecord.TRAIN_TEACHER = item.Nav_Record.Nav_Notify.TRAIN_TEACHER; @@ -470,11 +474,15 @@ namespace APT.PP.WebApi.Controllers.Api.PP newRecord.CLASS_NAME = item.Nav_Record.Nav_Notify.NAME; newRecord.START_TIME = (DateTime)item.Nav_Record.Nav_Notify.TRAIN_START_TIME; newRecord.END_TIME = (DateTime)item.Nav_Record.Nav_Notify.TRAIN_END_TIME; - newRecord.TRAIN_TYPE = changeEnum(item.Nav_Record.Nav_Notify.TRAIN_MODEL); - newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS; + //newRecord.TRAIN_TYPE = changeEnum(item.Nav_Record.Nav_Notify.TRAIN_MODEL); //newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME; - newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.CHECKTYPE.GetDescription(); - + try + { + newRecord.TRAIN_TYPE = item.Nav_Record.Nav_Notify.TRAINTYPE.GetDescription(); + newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.CHECKTYPE.GetDescription(); + } + catch { } + newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS; newRecord.ORG_ID = filter.GetOrgId(); newRecord.USER_ID = item.USER_ID;