wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排班配置清除缓存并执行

Browse Source
This commit is contained in:
何美荣 2026-05-07 17:10:50 +08:00
parent 54777a5a4d
commit e62b8d1632
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APT.MicroApi/APT.FM.WebApi/Controllers/Api/DepartmentSchedulingController.cs
View File

@ -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<T_FM_DEPARTMENT_SCHEDULING>(s => s.DATE_TIME.Date >= currTime && departIds.Contains(s.DEPARTMENT_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
deleteShiftDataIds = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING>(s => s.DATE_TIME.Date >= currTime.Date && departIds.Contains(s.DEPARTMENT_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
deleteShiftPersonIds = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING_DETAIL>(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<T_FM_DEPARTMENT_SCHEDULING>(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();

2
APT.MicroApi/APT.PP.WebApi/Controllers/Api/RunController.cs
View File

@ -222,7 +222,7 @@ namespace APT.PP.WebApi.Controllers
sh.CURR_TIME = curPerEndDay.AddDays(1);
}
var shiftDataTemp = this.GetEntities_noneBase<T_FM_DEPARTMENT_SCHEDULING>(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);