From 88fdebd7f6e2936ae00b8999a86a7f301c914ab3 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 21 十月 2024 17:42:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
index a4f878d..577d26c 100644
--- a/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
+++ b/_Main/BL/Type_LocalCell_OfflinePlanComparison/StaticMethod_ComparedNew.qbl
@@ -116,30 +116,30 @@
traverse( table,LocalRow,row ){
traverse( table,LocalColumn,column,column.TimeUnit() = "Week"){
- baseVersionValue := sum( table,LocalRow.LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
+ baseVersionValue := sum( row,LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
cell.LocalColumn().TimeUnit() = "Day" and
cell.LocalColumn().CustomDate() >= column.CustomDate() and
- cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextWeek(), cell.BaseVersionValue());
- compareVersionValue := sum( table,LocalRow.LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
+ cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextWeek(), cell.BaseVersion());
+ compareVersionValue := sum( row,LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
cell.LocalColumn().TimeUnit() = "Day" and
cell.LocalColumn().CustomDate() >= column.CustomDate() and
- cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextWeek(), cell.CompareVersionValue());
+ cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextWeek(), cell.CompareVersion());
- row.LocalCell(relnew,LocalCell_OfflinePlanComparison,LocalColumn := column,BaseVersionValue := baseVersionValue,CompareVersionValue := compareVersionValue );
+ row.LocalCell( relnew,LocalCell_OfflinePlanComparison,LocalColumn := column,BaseVersion := baseVersionValue,CompareVersion := compareVersionValue );
}
}
traverse( table,LocalRow,row ){
- traverse( table,LocalColumn,column,column.TimeUnit() = "Month "){
- baseVersionValue := sum( table,LocalRow.LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
+ traverse( table,LocalColumn,column,column.TimeUnit() = "Month"){
+ baseVersionValue := sum( row,LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
cell.LocalColumn().TimeUnit() = "Day" and
cell.LocalColumn().CustomDate() >= column.CustomDate() and
- cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextMonth(), cell.BaseVersionValue());
- compareVersionValue := sum( table,LocalRow.LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
+ cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextMonth(), cell.BaseVersion());
+ compareVersionValue := sum( row,LocalCell.astype( LocalCell_OfflinePlanComparison ),cell,
cell.LocalColumn().TimeUnit() = "Day" and
cell.LocalColumn().CustomDate() >= column.CustomDate() and
- cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextMonth(), cell.CompareVersionValue());
+ cell.LocalColumn().CustomDate() < column.CustomDate().StartOfNextMonth(), cell.CompareVersion());
- row.LocalCell(relnew,LocalCell_OfflinePlanComparison,LocalColumn := column,BaseVersionValue := baseVersionValue,CompareVersionValue := compareVersionValue );
+ row.LocalCell( relnew,LocalCell_OfflinePlanComparison,LocalColumn := column,BaseVersion := baseVersionValue,CompareVersion := compareVersionValue );
}
}
--
Gitblit v1.9.3