From bee3b97ebd80eb0a96702823d5d142bcb4cb5fac Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 10 九月 2024 17:54:27 +0800
Subject: [PATCH] 修复一些问题

---
 _Main/BL/Type_ShiftPlan/Method_GetDefaultDayOvertimeHour.qbl |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/_Main/BL/Type_ShiftPlan/Method_GetDefaultDayOvertimeHour.qbl b/_Main/BL/Type_ShiftPlan/Method_GetDefaultDayOvertimeHour.qbl
index ab6d8ac..d561c56 100644
--- a/_Main/BL/Type_ShiftPlan/Method_GetDefaultDayOvertimeHour.qbl
+++ b/_Main/BL/Type_ShiftPlan/Method_GetDefaultDayOvertimeHour.qbl
@@ -10,26 +10,29 @@
     overtime := 0.0;
     nextDayOvertime := 0.0;
     if( this.Outcome() = "1" ){
-      overtime := 0;
+      overtime := 0.0;
       nextDayOvertime := 0.0;
     }else if( this.Outcome() = "2" ){
-      overtime := 0;
+      overtime := 0.0;
       nextDayOvertime := 0.0;
     }else if(this.Outcome() = "9+9"){
-      overtime := 1;
-      nextDayOvertime := 1;
+      overtime := 2.0;
+      nextDayOvertime := 0.0;
     }else if(this.Outcome() = "10+10"){
-      overtime := 2;
-      nextDayOvertime := 2;
+      overtime := 4.0;
+      nextDayOvertime := 0.0;
+    }else if(this.Outcome() = "11+11"){
+      overtime := 6.0;
+      nextDayOvertime := 0.0;
     }else if(this.Outcome() = "1(9)" or this.Outcome() = "1锛�9锛�"){
-      overtime := 1;
-      nextDayOvertime := 0;
+      overtime := 1.0;
+      nextDayOvertime := 0.0;
     }else if(this.Outcome() = "1(10)" or this.Outcome() = "1锛�10锛�"){
-      overtime := 2;
-      nextDayOvertime := 0;
+      overtime := 2.0;
+      nextDayOvertime := 0.0;
     }else if(this.Outcome() = "3"){
-      overtime := 0;
-      nextDayOvertime := 0;
+      overtime := 0.0;
+      nextDayOvertime := 0.0;
     }
     result := 0.0;
     if( isGetNextDay ){

--
Gitblit v1.9.3