From 7bdd9bb795041a46eb954bd6bffb1d9bef24a8ff Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 14 十月 2024 10:46:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl b/_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl
index cc7ee8d..61a15c7 100644
--- a/_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl
+++ b/_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl
@@ -23,14 +23,16 @@
result := "";
flag := true;
traverse( values,Elements,value ,flag){
- if( value = "璋冧紤" and result <> "璋冧紤"){
+ if( value = "璋冧紤" and result <> "娉曞畾鑺傚亣鏃�"){
result := "璋冧紤";
}else if( value = "娉曞畾鑺傚亣鏃�" and result <> "娉曞畾鑺傚亣鏃�"){
result := "娉曞畾鑺傚亣鏃�";
- }else if( value = "鍛ㄥ叚" and result <> "鍛ㄥ叚"){
+ }else if( value = "鍛ㄥ叚" and result <> "娉曞畾鑺傚亣鏃�"){
result := "鍛ㄥ叚";
- }else if( value = "鍛ㄦ棩" and result <> "鍛ㄦ棩"){
+ }else if( value = "鍛ㄦ棩" and result <> "娉曞畾鑺傚亣鏃�"){
result := "鍛ㄦ棩";
+ }else if( value = "鍛ㄦ湯" and result <> "娉曞畾鑺傚亣鏃�"){
+ result := "鍛ㄦ湯";
}
}
--
Gitblit v1.9.3