From b6c4b309231d86f88ca2df31efe09f3e405cb5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Fri, 5 Jun 2026 17:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A6=E5=8F=91=E4=BA=A4=E6=8E=A5=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/CurrentClassRecord.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs index 7746af4..ae4381d 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs @@ -407,7 +407,9 @@ namespace APT.FO.WebApi.Controllers.Api.FO T_FM_NOTIFICATION_TASK sendNotice = null; T_FO_CURRENT_CLASS_RECORD model = null; if (todoCount == 0) - { + { + var users = GetEntities(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList(); + var files = GetEntities(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList(); model = GetEntity(entity.ID.ToString()); if (model.CURRENT_CLASS_STATUS == (int)FOShiftRecordStatusEnum.不正常 || model.DEVICE_STATUS == (int)FOShiftRecordStatusEnum.不正常 || model.ENVIRONMENT_STATUS == (int)FOShiftRecordStatusEnum.不正常 || model.SUPPLIES_STATUS == (int)FOShiftRecordStatusEnum.不正常) { @@ -428,8 +430,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO var currDepartmentConfig = GetEntity(t => t.TEAM_ID == model.CLASS_TEAM_ID && t.IS_DELETED == false, "Nav_DepartmentCalendarConfig"); if (currDepartmentConfig != null && currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true) { - var users = GetEntities(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList(); - var files = GetEntities(t => t.CURRENT_CLASS_RECORD_ID == entity.ID, new BaseFilter(orgId)).ToList(); + var searchFilter = new BaseFilter(model.ORG_ID); searchFilter.SelectField = new string[] { "TEAM_ID", "PERSON_ID", "Nav_Person.Nav_Post", "Nav_Person.Nav_User", "Nav_DepartmentScheduling" }; var nextClassUsersAll = GetEntities(i => i.DEPARTMENT_SCHEDULING_ID == model.NEXT_CLASS_TEAM_ID && i.Nav_Person.Nav_Post.ID == model.DEPARTMENT_POST_ID && i.Nav_Person.Nav_User.ENABLE_STATUS == 0, searchFilter).ToList(); @@ -441,6 +442,10 @@ namespace APT.FO.WebApi.Controllers.Api.FO { model.REMARK = "未能找到接班人员"; } + } + else if (model.IS_HANDOVER) + { + CreateChangeShiftRecord(entity, users, files, null); } } }