From a54867e7bc74f0812a993bc287bc1e14c30c1b60 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: Thu, 7 May 2026 16:18:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B7=91=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/FMController.cs | 85 ++++++++++++------- .../Controllers/Api/SKController.cs | 2 +- 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs index ae6f65d..52d0850 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FMController.cs @@ -2783,11 +2783,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP var teamLists = new List(); var teamPersonLists = new List(); var teamPersonIds = new List(); - var departs = this.GetEntities(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE && t.DEPARTMENT_TYPE == (int)FMDepartmentType.Class,new BaseFilter(filter.OrgId)); + var departs = this.GetEntities_noneBase(t => t.DEPARTMENT_TYPE == (int)FMDepartmentType.Class); var departIds = departs.Select(t => t.ID).ToList(); - var teams = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); + var teams = this.GetEntities_noneBase(t => true); var teamPersons = this.GetEntities< T_FM_TEAM_PERSON> (t =>true, new BaseFilter(filter.OrgId)); - var users = this.GetEntities(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID != null && departIds.Contains((Guid)t.DEPARTMENT_ID),new BaseFilter(filter.OrgId)); + var users = this.GetEntities(t => t.DEPARTMENT_ID != null && departIds.Contains((Guid)t.DEPARTMENT_ID),new BaseFilter(filter.OrgId)); if (departIds != null && departIds.Any()) { foreach (var item in departIds) @@ -2798,55 +2798,74 @@ namespace APT.PP.WebApi.Controllers.Api.PP var teamInfo = teams.FirstOrDefault(t => t.DEPARTMENT_ID == item); if (teamInfo == null) { - T_FM_TEAM team = new T_FM_TEAM(); - team.ORG_ID = filter.OrgId; - team.CHARGE_PERSON_ID = userInfo?.PERSON_ID; - team.NAME = departInfo.NAME; - team.ENABLE_STATUS = 0; - team.DEPARTMENT_ID = item; - teamLists.Add(team); - if (persons != null && persons.Any()) + if (departInfo.IS_DELETED == false) { - foreach (var per in persons) + T_FM_TEAM team = new T_FM_TEAM(); + team.ORG_ID = filter.OrgId; + team.CHARGE_PERSON_ID = userInfo?.PERSON_ID; + team.NAME = departInfo.NAME; + team.ENABLE_STATUS = 0; + team.DEPARTMENT_ID = item; + team.ENABLE_STATUS = departInfo.ENABLE_STATUS; + team.IS_DELETED = departInfo.IS_DELETED; + teamLists.Add(team); + if (persons != null && persons.Any()) { - T_FM_TEAM_PERSON person = new T_FM_TEAM_PERSON(); - person.ORG_ID = filter.OrgId; - person.TEAM_ID = team.ID; - person.PERSON_ID = (Guid)per.PERSON_ID; - teamPersonLists.Add(person); + foreach (var per in persons) + { + T_FM_TEAM_PERSON person = new T_FM_TEAM_PERSON(); + person.ORG_ID = filter.OrgId; + person.TEAM_ID = team.ID; + person.PERSON_ID = (Guid)per.PERSON_ID; + person.IS_DELETED = departInfo.IS_DELETED; + teamPersonLists.Add(person); + } } } } else { teamInfo.CHARGE_PERSON_ID = userInfo?.PERSON_ID; + teamInfo.ENABLE_STATUS = departInfo.ENABLE_STATUS; + teamInfo.IS_DELETED = departInfo.IS_DELETED; teamLists.Add(teamInfo); - var personIds = teamPersons.Where(t => t.TEAM_ID == teamInfo.ID).Select(m=>m.PERSON_ID).ToList(); - if (persons != null && persons.Any()) + if (teamInfo.IS_DELETED == true) { - foreach (var per in persons) + foreach (var item1 in teamPersons.Where(t => t.TEAM_ID == teamInfo.ID)) { - if (!personIds.Contains((Guid)per.PERSON_ID)) - { - T_FM_TEAM_PERSON person = new T_FM_TEAM_PERSON(); - person.ORG_ID = filter.OrgId; - person.TEAM_ID = teamInfo.ID; - person.PERSON_ID = (Guid)per.PERSON_ID; - teamPersonLists.Add(person); - } + item1.IS_DELETED = true; + teamPersonLists.Add(item1); } } - var deletePersonIds = users.Where(t => personIds.Contains((Guid)t.PERSON_ID) && t.DEPARTMENT_ID != teamInfo.DEPARTMENT_ID).Select(m=>m.PERSON_ID).ToList(); - teamPersonIds = teamPersons.Where(t => deletePersonIds.Contains(t.PERSON_ID)).Select(m => m.ID).ToList(); + else + { + var personIds = teamPersons.Where(t => t.TEAM_ID == teamInfo.ID).Select(m => m.PERSON_ID).ToList(); + if (persons != null && persons.Any()) + { + foreach (var per in persons) + { + if (!personIds.Contains((Guid)per.PERSON_ID)) + { + T_FM_TEAM_PERSON person = new T_FM_TEAM_PERSON(); + person.ORG_ID = filter.OrgId; + person.TEAM_ID = teamInfo.ID; + person.PERSON_ID = (Guid)per.PERSON_ID; + teamPersonLists.Add(person); + } + } + } + var deletePersonId = teamPersonLists.Select(t => t.PERSON_ID).ToList(); + teamPersonIds = teamPersons.Where(t => personIds.Contains(t.PERSON_ID) && t.TEAM_ID != teamInfo.ID).Select(m => m.ID).ToList(); + } } } } UnifiedCommit(() => { - if (teamLists != null && teamLists.Any()) - BantchSaveEntityNoCommit(teamLists); if (teamPersonLists != null && teamPersonLists.Any()) - BantchSaveEntityNoCommit(teamPersonLists); + BantchUpdateEntity_noneBase(teamPersonLists); + if (teamLists != null && teamLists.Any()) + BantchUpdateEntity_noneBase(teamLists); if (teamPersonIds != null && teamPersonIds.Any()) BantchDeleteEntityNoCommit(teamPersonIds); }); diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index da2b3a7..902717b 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -815,7 +815,7 @@ namespace APT.PP.WebApi.Controllers.Api // "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.ISMAINCHECK","Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.CHECKTIME","Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.ISCHECK", // "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.SECURITY_INSPECTION_RECORD_DETAIL_ID","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.SECURITY_INSPECTION_RECORD_DETAIL_ID", // "Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.LAW_ID" }; //指定字段，包括导航属性 - var notices = GetEntities(i => i.CHECK_TIME.Value.AddDays(2).Date == dtNow.Date && i.CHECK_TIME.Value.AddDays(2).Hour == dtNow.Hour && i.Nav_CheckType != null && !i.Nav_CheckType.NAME.Contains("岗位排查") && (i.STATUS == PFStandardStatus.Archived || i.STATUS == PFStandardStatus.Sign), baseFilter); + var notices = GetEntities(i => i.CHECK_TIME.Value.AddDays(2).Date == dtNow.Date && i.CHECK_TIME.Value.AddDays(2).Hour == dtNow.Hour && i.Nav_CheckType != null && !i.Nav_CheckType.NAME.Contains("岗位排查") && (i.STATUS == PFStandardStatus.Archived || i.STATUS == PFStandardStatus.Sign || i.STATUS == PFStandardStatus.Close), baseFilter); var noticeIds = notices.Select(t => t.ID).ToList(); var sumNoticeIds = GetEntities(t => t.SECURITY_INSPECTION_NOTICE_ID != null && noticeIds.Contains((Guid)t.SECURITY_INSPECTION_NOTICE_ID), baseFilter).Select(m => m.SECURITY_INSPECTION_NOTICE_ID).Distinct().ToList(); var needDealIds = noticeIds.Where(t => !sumNoticeIds.Contains(t)).ToList(); From e62b8d1632bd1458c54795b87409d1298476ab51 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: Thu, 7 May 2026 17:10:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=92=E7=8F=AD=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=BC=93=E5=AD=98=E5=B9=B6=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/DepartmentSchedulingController.cs | 4 ++-- APT.MicroApi/APT.PP.WebApi/Controllers/Api/RunController.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentSchedulingController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentSchedulingController.cs index 3e62d9f..342a3ff 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentSchedulingController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentSchedulingController.cs @@ -88,7 +88,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM var cycle = departmentConfig.FirstOrDefault().CYCLE; var currTime = departmentConfig.FirstOrDefault().CURR_TIME; var departIds = departmentConfig.Select(t => t.DEPARTMENT_ID).Distinct().ToList(); - deleteShiftDataIds = this.GetEntities(s => s.DATE_TIME.Date >= currTime && departIds.Contains(s.DEPARTMENT_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList(); + deleteShiftDataIds = this.GetEntities(s => s.DATE_TIME.Date >= currTime.Date && departIds.Contains(s.DEPARTMENT_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList(); deleteShiftPersonIds = this.GetEntities(s => deleteShiftDataIds.Contains(s.DEPARTMENT_SCHEDULING_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList(); //departmentConfig.ForEach(x => x.CURR_TIME = DateTime.Now.Date.AddDays(1)); //排序排班的最后几条记录 @@ -97,7 +97,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM pageFilter.Order = DbOrder.DESC; pageFilter.Sort = "DATE_TIME"; var shiftDataTemp = this.GetEntities(s => s.DEPARTMENT_CALENDAR_CONFIG_ID == configId - && s.DATE_TIME < currTime && s.DATE_TIME >= currTime.AddDays(-cycle) && departIds.Contains(s.DEPARTMENT_ID)&& s.IS_DELETED == false, new BaseFilter(filter.OrgId)).ToList(); + && s.DATE_TIME.Date < currTime.Date && s.DATE_TIME.Date >= currTime.AddDays(-cycle).Date && departIds.Contains(s.DEPARTMENT_ID)&& s.IS_DELETED == false, new BaseFilter(filter.OrgId)).ToList(); updateShiftData.AddRange(shiftDataTemp); updateShiftData.ForEach(x => x.IS_DELETED = true); //var updateShiftIds = updateShiftData.Select(m => m.ID).ToList(); diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/RunController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/RunController.cs index bc31d39..790edb1 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/RunController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/RunController.cs @@ -222,7 +222,7 @@ namespace APT.PP.WebApi.Controllers sh.CURR_TIME = curPerEndDay.AddDays(1); } var shiftDataTemp = this.GetEntities_noneBase(s => s.DEPARTMENT_CALENDAR_CONFIG_ID == sh.ID - && s.DATE_TIME < oldCurrTime && s.DATE_TIME >= oldCurrTime.AddDays(-sh.CYCLE) && s.DEPARTMENT_ID == sh.DEPARTMENT_ID && s.IS_DELETED == true).ToList(); + && s.DATE_TIME.Date < oldCurrTime.Date && s.DATE_TIME.Date >= oldCurrTime.AddDays(-sh.CYCLE).Date && s.DEPARTMENT_ID == sh.DEPARTMENT_ID && s.IS_DELETED == true).ToList(); updateShiftData.AddRange(shiftDataTemp); updateShiftData.ForEach(x => x.IS_DELETED = false);