From d50473cb8a43aedf3a1426ec72340f28f0d77739 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Mon, 30 Sep 2024 18:16:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AD=89=E7=BA=A7=E5=BC=82?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ghre/Ghre_TeacherChangeController.cs | 7 +------ Tiobon.Core.Services/CommonServices.cs | 7 ++++--- .../Ghre/Ghre_TeacherChangeServices.cs | 11 +++++----- Tiobon.Core/Tiobon.Core.Model.xml | 20 +++++++++++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_TeacherChangeController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_TeacherChangeController.cs index 3627fba2..171ce66e 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_TeacherChangeController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_TeacherChangeController.cs @@ -29,12 +29,7 @@ public class Ghre_TeacherChangeController : BaseController> QueryByStatus([FromBody] QueryBody body, string status) { - if (status == "Active") - return await _service.QueryFilterPage(body, $"(Status ='{status}' OR (WorkID IS NOT NULL AND WorkState IN (0,1)))"); - else if (status == "Disable") - return await _service.QueryFilterPage(body, null, false); - else - return await _service.QueryFilterPage(body, $"Status ='{status}' AND WorkID IS NULL"); + return await _service.QueryFilterPage(body, $"Status ='{status}'"); } #endregion diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index 3de0f327..5b48cbd9 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1132,7 +1132,7 @@ public partial class CommonServices : BaseServices>, ICommon case "F_Training_Demand_ToDo": case "F_TeacherManageTemporary": - case "F_TeacherChangeManageTemporary": + case "F_TeacherChangeTemporary": toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault(); if (toolbar != null) { toolbar.fnKey = "TBD1YN"; } toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault(); @@ -1186,8 +1186,9 @@ public partial class CommonServices : BaseServices>, ICommon case "F_TeacherManage": case "F_TeacherManageActive": case "F_TeacherChangeManage": - case "F_TeacherChangeManageActive": + case "F_TeacherChangeActive": case "F_TeacherDisabled": + case "F_TeacherChangeDisabled": toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault(); if (toolbar != null) { toolbar.fnKey = "TBD1YN"; } toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault(); @@ -1197,7 +1198,7 @@ public partial class CommonServices : BaseServices>, ICommon toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault(); if (toolbar != null) toolbar.fnKey = "TBD4YN"; break; - case "F_TeacherChangeManageWaitConfirm": + case "F_TeacherChangeWaitConfirm": case "F_TeacherManageWaitConfirm": toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault(); if (toolbar != null) { toolbar.fnKey = "TBD1YN"; } diff --git a/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs index dd06c079..39d4b419 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs @@ -43,23 +43,24 @@ public class Ghre_TeacherChangeServices : BaseServices x.SchoolId != null).Select(x => x.SchoolId.Value).Distinct().ToList(); - var deptIDs = data.Where(x => x.DeptID != null).Select(x => x.DeptID).Distinct().ToList(); var teacherIds = data.Where(x => x.TeacherId != null).Select(x => x.TeacherId).Distinct().ToList(); + var teachers = await Db.Queryable().Where(x => teacherIds.Contains(x.Id)).Select(x => new { x.Id, x.SchoolId, x.DeptID, x.TeacherType, TeacherName = x.TeacherName + " (" + x.TeacherNo + ")" }).ToListAsync(); + var schoolIds = teachers.Where(x => x.SchoolId != null).Select(x => x.SchoolId.Value).Distinct().ToList(); + var deptIDs = teachers.Where(x => x.DeptID != null).Select(x => x.DeptID).Distinct().ToList(); var depts = await Db.Queryable().Where(x => deptIDs.Contains(x.DeptID)).Select(x => new { x.DeptID, x.DeptName }).ToListAsync(); var schools = await Db.Queryable().Where(x => schoolIds.Contains(x.Id)).Select(x => new { x.Id, x.SchoolName }).ToListAsync(); - var teachers = await Db.Queryable().Where(x => teacherIds.Contains(x.Id)).Select(x => new { x.Id, TeacherName = x.TeacherName + " （" + x.TeacherNo + "）" }).ToListAsync(); data.ForEach(async x => { + var teacher = teachers.FirstOrDefault(o => o.Id == x.TeacherId); x.TeacherTypeLabel = await GetParaLabel("TrainingTeacherType", x.TeacherType); x.TeacherLevelLabel = await GetParaLabel("TrainingTeacherLevel", x.TeacherLevel); x.OriginTeacherLevelLabel = await GetParaLabel("TrainingTeacherLevel", x.OriginTeacherLevel); x.ChangeTypeLabel = await GetParaLabel("TrainingTeacherChangeType", x.ChangeType); x.OriginChangeTypeLabel = await GetParaLabel("TrainingTeacherChangeType", x.OriginChangeType); - x.DeptOrSchoolName = x.TeacherType == "Out" ? schools.FirstOrDefault(o => o.Id == x.SchoolId)?.SchoolName : depts.FirstOrDefault(o => o.DeptID == x.DeptID)?.DeptName; - x.TeacherName = teachers.FirstOrDefault(o => o.Id == x.TeacherId)?.TeacherName; + x.DeptOrSchoolName = x.TeacherType == "Out" ? schools.FirstOrDefault(o => o.Id == teacher?.SchoolId)?.SchoolName : depts.FirstOrDefault(o => o.DeptID == teacher?.DeptID)?.DeptName; + x.TeacherName = teacher?.TeacherName; x.OriginChangeDate1 = DateTimeHelper.ConvertToDayString(x.OriginChangeDate); x.ChangeDate1 = DateTimeHelper.ConvertToDayString(x.ChangeDate); }); diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 06df0c48..664fc7e4 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -5345,6 +5345,11 @@ 默认标志 + + + 发起人 + + 状态 @@ -5705,6 +5710,11 @@ 申请理由 + + + 发起人 + + 状态 @@ -13051,6 +13061,11 @@ 默认标志 + + + 发起人 + + 状态 @@ -13416,6 +13431,11 @@ 状态 + + + 发起人 + + 默认标志