From 284dcbad0bb037ef25e53cbb0af26c0100865af0 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 14 十月 2024 18:29:26 +0800
Subject: [PATCH] 修复一些bug
---
_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl b/_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl
index b53b40e..7b369a3 100644
--- a/_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl
+++ b/_Main/BL/Type_LocalTool/StaticMethod_BatchSetUnitShiftPattern.qbl
@@ -5,7 +5,8 @@
ShiftPattern shiftPattern,
Date startDate,
Date endDate,
- Numbers weekdays
+ Numbers weekdays,
+ Number skipWeek
)
{
TextBody:
@@ -22,15 +23,14 @@
period_MP.EndDate() <= endDate and exists( weekdays, Elements,dayOfWeek,dayOfWeek = period_MP.StartDate().DayOfWeek() ),period_MP.StartDate());
if( dayPeriod_MPs.Size() > 0 ){
- unitPeriodTimes := selectset( unit,UnitPeriod.astype( UnitPeriodTime ),unitPeriodTime,exists( dayPeriod_MPs,Elements,period_MP,period_MP = unitPeriodTime.Period_MP()) and not isnull( unitPeriodTime.UnitAvailability()));
+ unitPeriodTimes := selectset( unit,UnitPeriod.astype( UnitPeriodTime ),unitPeriodTime,exists( dayPeriod_MPs,Elements,period_MP,period_MP = unitPeriodTime.Period_MP()));
if( unitPeriodTimes.Size() > 0 ){
LocalTool::SetUnitShiftPattern( owner,unitPeriodTimes,shiftPattern );
}
-
}
if( weekPeriod_MPs.Size() <> 0 ){
traverse( weekPeriod_MPs,Elements,period_MP ){
- unitPeriodTimes := selectset( unit,UnitPeriod.astype( UnitPeriodTime ),unitPeriodTime,period_MP = unitPeriodTime.Period_MP() and not isnull( unitPeriodTime.UnitAvailability()));
+ unitPeriodTimes := selectset( unit,UnitPeriod.astype( UnitPeriodTime ),unitPeriodTime,period_MP = unitPeriodTime.Period_MP());
if( unitPeriodTimes.Size() > 0 ){
LocalTool::SetUnitShiftPattern( owner,unitPeriodTimes,shiftPattern );
}
--
Gitblit v1.9.3