From bf5fbf1ac7ba16a1abcdb7791ea9e9b522e77c01 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Fri, 10 Apr 2026 16:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=9F=B9=E8=AE=AD=E6=95=99?= =?UTF-8?q?=E8=82=B2=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=20=E6=8C=89=E4=BA=BA=E5=91=98=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8D=95=E5=85=83=20=E6=B7=BB=E5=8A=A0=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SEController.cs | 138 +++++++++--------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs index 97a6ce5..0062e9d 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs @@ -423,79 +423,79 @@ namespace APT.PP.WebApi.Controllers.Api.PP List recordLists = new List(); foreach (var item in trainRecords) { - if (item.Nav_User.Nav_ProdutionUnit != null) + //if (item.Nav_User.Nav_ProdutionUnit != null) + //{ + // foreach (var dep in item.Nav_User.Nav_ProdutionUnit) + // { + // T_SE_TRAIN_RECORD_REPORT newRecord = new T_SE_TRAIN_RECORD_REPORT(); + // newRecord.NAME = item.Nav_User.NAME; + // newRecord.CODE = item.Nav_User.CODE; + // newRecord.LEVEL = item.Nav_Record.Nav_Notify.LEVEL.GetDescription(); + // newRecord.DEPARTMENT_NAME = item.Nav_User.Nav_Department.NAME; + // newRecord.UNIT = dep.Nav_Enums.NAME; + // 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_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME; + // 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; + + // newRecord.USER_ID = item.USER_ID; + // newRecord.NOTIFY_ID = item.Nav_Record.NOTIFY_ID; + // var papers = item.Nav_Record.Nav_Papers.FirstOrDefault(t => t.USER_ID == item.USER_ID); + // if (papers != null) + // { + // newRecord.TRAIN_SCORE = item.Nav_Record.Nav_Papers.FirstOrDefault(t => t.USER_ID == item.USER_ID).SCORE; + + // } + // var score = item.Nav_Record.Nav_Papers.FirstOrDefault(t => t.USER_ID == item.ID); + // if (score != null) + // { + // newRecord.TRAIN_SCORE = score.SCORE; + // } + // recordLists.Add(newRecord); + // } + //} + //else + //{ + T_SE_TRAIN_RECORD_REPORT newRecord = new T_SE_TRAIN_RECORD_REPORT(); + newRecord.NAME = item.Nav_User.NAME; + newRecord.CODE = item.Nav_User.CODE; + newRecord.LEVEL = item.Nav_Record.Nav_Notify.LEVEL.GetDescription(); + newRecord.DEPARTMENT_NAME = item.Nav_User.Nav_Department.NAME; + 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_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME; + try { - foreach (var dep in item.Nav_User.Nav_ProdutionUnit) - { - T_SE_TRAIN_RECORD_REPORT newRecord = new T_SE_TRAIN_RECORD_REPORT(); - newRecord.NAME = item.Nav_User.NAME; - newRecord.CODE = item.Nav_User.CODE; - newRecord.LEVEL = item.Nav_Record.Nav_Notify.LEVEL.GetDescription(); - newRecord.DEPARTMENT_NAME = item.Nav_User.Nav_Department.NAME; - newRecord.UNIT = dep.Nav_Enums.NAME; - 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_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME; - 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; - - newRecord.USER_ID = item.USER_ID; - newRecord.NOTIFY_ID = item.Nav_Record.NOTIFY_ID; - var papers = item.Nav_Record.Nav_Papers.FirstOrDefault(t => t.USER_ID == item.USER_ID); - if (papers != null) - { - newRecord.TRAIN_SCORE = item.Nav_Record.Nav_Papers.FirstOrDefault(t => t.USER_ID == item.USER_ID).SCORE; - - } - var score = item.Nav_Record.Nav_Papers.FirstOrDefault(t => t.USER_ID == item.ID); - if (score != null) - { - newRecord.TRAIN_SCORE = score.SCORE; - } - recordLists.Add(newRecord); - } + newRecord.TRAIN_TYPE = item.Nav_Record.Nav_Notify.TRAINTYPE.GetDescription(); + newRecord.TRAIN_MODEL = item.Nav_Record.Nav_Notify.CHECKTYPE.GetDescription(); } - else + catch { } + newRecord.TRAIN_HOUR = item.Nav_Record.Nav_Notify.HOURS; + newRecord.ORG_ID = filter.GetOrgId(); + + newRecord.USER_ID = item.USER_ID; + newRecord.NOTIFY_ID = item.Nav_Record.NOTIFY_ID; + + var score = item.Nav_Record.Nav_Papers.FirstOrDefault(t => t.USER_ID == item.ID); + if (score != null) { - T_SE_TRAIN_RECORD_REPORT newRecord = new T_SE_TRAIN_RECORD_REPORT(); - newRecord.NAME = item.Nav_User.NAME; - newRecord.CODE = item.Nav_User.CODE; - newRecord.LEVEL = item.Nav_Record.Nav_Notify.LEVEL.GetDescription(); - newRecord.DEPARTMENT_NAME = item.Nav_User.Nav_Department.NAME; - 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_MODEL = item.Nav_Record.Nav_Notify.Nav_TrainCheckType.NAME; - 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; - newRecord.NOTIFY_ID = item.Nav_Record.NOTIFY_ID; - - var score = item.Nav_Record.Nav_Papers.FirstOrDefault(t => t.USER_ID == item.ID); - if (score != null) - { - newRecord.TRAIN_SCORE = score.SCORE; - } - recordLists.Add(newRecord); + newRecord.TRAIN_SCORE = score.SCORE; } + recordLists.Add(newRecord); + //} } UnifiedCommit(() =>