From b0612bf1f3bbd4640b36f2db6ccb166ecae69d37 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 31 五月 2024 17:13:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_Archive/StaticMethod_Archive.qbl | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_Archive/StaticMethod_Archive.qbl b/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
index 8452813..8969d8c 100644
--- a/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_Archive.qbl
@@ -3,7 +3,10 @@
StaticMethod Archive (
JSON respJSON,
Archive archive,
- String archiveType
+ String archiveType,
+ BinaryValue ppaBinaryValue,
+ String curveFileName,
+ BinaryValue curveBinaryValue
)
{
TextBody:
@@ -11,6 +14,7 @@
code := respJSON.Get( "code" ).GetNumber();
archiveFileJSONs := respJSON.Get( "archiveFiles" );
info( archiveFileJSONs.AsString() );
+
if ( code = 200 ) {
for ( i := 0; i < archiveFileJSONs.Size(); i++ ) {
archiveFileJSON := archiveFileJSONs.Get( i );
@@ -40,12 +44,21 @@
archive.ArchiveBudget( relnew, Name := fileName, FilePath := filePath );
}
} else if ( archiveType = "PPA" ) {
+ // 瀛樻。PPA
appa := select( archive, ArchivePPA, tempAPPA, tempAPPA.Name() = fileName );
if ( not isnull( appa ) ) {
appa.FilePath( filePath );
+ appa.SourceFileBinaryValue( ppaBinaryValue );
} else {
- archive.ArchivePPA( relnew, Name := fileName, FilePath := filePath );
+ archive.ArchivePPA( relnew, Name := fileName, FilePath := filePath, SourceFileBinaryValue := ppaBinaryValue );
}
+
+ // 瀛樻。Curve
+ ac := select( archive, ArchiveCurve, tempAC, true );
+ if ( not isnull( ac ) ) {
+ ac.Delete();
+ }
+ archive.ArchiveCurve( relnew, Name := "濮嬬粓鍙瓨涓�鐗�.xlsx", FilePath := curveFileName, SourceFileBinaryValue := curveBinaryValue );
}
}
}
--
Gitblit v1.9.3