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);