From eecb04ffcb5cb39c7f61cdd05b3295be2cbfde44 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Mon, 18 May 2026 11:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=AE=89=E5=85=A8=E6=95=99?= =?UTF-8?q?=E8=82=B2=E5=8D=A1=E3=80=81=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=20=E5=A4=84=E7=90=86=E9=9B=86=E5=9B=A2=E7=89=88=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=9F=A5=E7=9C=8B=20=E6=95=B0=E6=8D=AE=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=E3=80=81=20=E4=B8=89=E7=BA=A7=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=95=99=E8=82=B2=20=E4=BA=BA=E5=91=98=E8=BD=AF=E5=88=A0?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=A4=84=E7=90=86=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SEController/SENewUserDetailController.cs | 41 +++++++++++++++---- .../SETrainRecordReportController.cs | 11 +++-- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUserDetailController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUserDetailController.cs index 8b94fd9..34d0b0c 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUserDetailController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUserDetailController.cs @@ -23,13 +23,36 @@ namespace APT.SC.WebApi.Controllers.Api.SE [HttpPost, Route("SEOrderPaged")] public PagedActionResult SEOrderPaged([FromBody] KeywordPageFilter pageFilter) { - var recordfilter = new BaseFilter(pageFilter.GetOrgId()); - recordfilter.SelectField = new string[] { "USER_ID", "Nav_User.NAME", "Nav_User.CREATE_TIME" }; - var allUser = WitOrderPaged(null, pageFilter); - var totalUser = GetEntities(null, pageFilter).OrderByDescending(e => e.Nav_User.CREATE_TIME).Distinct(t => t.USER_ID); - allUser.Data = totalUser; - allUser.TotalCount = totalUser.Count(); - return allUser; + //var recordfilter = new BaseFilter(pageFilter.GetOrgId()); + //recordfilter.SelectField = new string[] { "USER_ID", "Nav_User.NAME", "Nav_User.CREATE_TIME" }; + //var allUser = WitOrderPaged(null, pageFilter); + //var totalUser = GetEntities(null, pageFilter).OrderByDescending(e => e.Nav_User.CREATE_TIME).Distinct(t => t.USER_ID); + //allUser.Data = totalUser; + //allUser.TotalCount = totalUser.Count(); + //return allUser; + return SafeGetPagedData(delegate (PagedActionResult result) + { + var resultTemp = GetOrderEntities(e => e.USER_ID.HasValue && !e.IS_DELETED && (e.Nav_User.IS_DELETED || !e.Nav_User.IS_DELETED), pageFilter).Distinct(t => t.USER_ID); + + var listUserIDDel = resultTemp.Where(e => e.Nav_User == null && e.USER_ID.HasValue).Select(e => e.USER_ID.Value).ToList(); + if (listUserIDDel != null && listUserIDDel.Count() > 0) + { + var fmUserDel = GetEntities_noneBase(e => listUserIDDel.Contains(e.ID) && (!e.IS_DELETED || e.IS_DELETED)); + if (fmUserDel != null && fmUserDel.Count() > 0) + { + foreach (var item in resultTemp) + { + if (item.Nav_User == null && item.USER_ID.HasValue) + { + item.Nav_User = fmUserDel.FirstOrDefault(e => e.ID == item.USER_ID.Value); + } + } + } + } + result.Data = resultTemp; + result.TotalCount = resultTemp.Count(); + }); + } /// /// 获得单条实体数据 @@ -54,11 +77,11 @@ namespace APT.SC.WebApi.Controllers.Api.SE { userFilter = new BaseFilter(filter.GetOrgId()); userFilter.Include = new string[] { "Nav_NewUser.Nav_Department", "Nav_NewUser.Nav_User", "Nav_NewUser.Nav_Content", "Nav_NewUser.Nav_Files.Nav_ImgFile", "Nav_User", "Nav_Department", "Nav_Post", "Nav_Files.Nav_ImgFile" }; - educard = GetEntities(t => t.USER_ID == Guid.Parse(userId), userFilter).ToList(); + educard = GetEntities(t => t.USER_ID == Guid.Parse(userId) && (t.Nav_NewUser.IS_DELETED || !t.Nav_NewUser.IS_DELETED), userFilter).ToList(); } else { - educard = GetEntities(t => t.USER_ID == Guid.Parse(userId), filter).ToList(); + educard = GetEntities(t => t.USER_ID == Guid.Parse(userId) && (t.Nav_NewUser.IS_DELETED || !t.Nav_NewUser.IS_DELETED), filter).ToList(); } ret = educard; return ret; diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs index 6fb3cf7..25dc066 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETrainRecordReportController.cs @@ -52,7 +52,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE } } } - var listInfo = GetEntities(null, pageFilter).GroupBy(e => new { e.UNIT, e.DEPARTMENT_NAME, e.CODE, e.NAME, e.USER_ID }).Select(e => new RECORD_REPORT { UNIT = e.Key.UNIT, CODE = e.Key.CODE, USER_ID = e.Key.USER_ID, NAME = e.Key.NAME, DEPARTMENT_NAME = e.Key.DEPARTMENT_NAME, TRAIN_HOUR_ALL = e.Sum(t => t.TRAIN_HOUR) }).OrderBy(e => e.UNIT).ThenBy(e => e.DEPARTMENT_NAME).ThenBy(e => e.NAME); + var listInfo = GetEntities(null, pageFilter).GroupBy(e => new { e.UNIT, e.DEPARTMENT_NAME, e.CODE, e.NAME, e.USER_ID, e.ORG_ID }).Select(e => new RECORD_REPORT { ORG_ID = e.Key.ORG_ID, UNIT = e.Key.UNIT, CODE = e.Key.CODE, USER_ID = e.Key.USER_ID, NAME = e.Key.NAME, DEPARTMENT_NAME = e.Key.DEPARTMENT_NAME, TRAIN_HOUR_ALL = e.Sum(t => t.TRAIN_HOUR) }).OrderBy(e => e.UNIT).ThenBy(e => e.DEPARTMENT_NAME).ThenBy(e => e.NAME); var listDataT = listInfo.Skip(pageFilter.Start).Take(pageFilter.Limit).ToArray(); var listData = new List(); foreach (var item in listDataT) @@ -66,7 +66,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE USER_ID = item.USER_ID, TRAIN_HOUR = item.TRAIN_HOUR_ALL, START_TIME_S = START_TIME_S, - START_TIME_E = START_TIME_E + START_TIME_E = START_TIME_E, + ORG_ID = item.ORG_ID }); } result.Data = listData; @@ -596,7 +597,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE var fullFilePart = $"{fileP}{fileNameP}"; var fullFilePath = $"{fileP}{fileNameP}{fileName}"; - string Result= $"{fileNameP}{fileName}"; + string Result = $"{fileNameP}{fileName}"; //如果没有文件夹 创建 //如果文件夹下有超过10个文件 按时间 删除多余的 if (!Directory.Exists(fullFilePart)) @@ -636,6 +637,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE public class RECORD_REPORT { + /// + /// 生产单元 + /// + public Guid? ORG_ID { get; set; } /// /// 生产单元