Browse Source

fix: export with iso miss

ryanemax 6 months ago
parent
commit
d88bab12db

+ 25 - 15
server/cloud/tbook/func-tbook-export.js

@@ -241,17 +241,27 @@ function fixVolumeData(json,volumeData,index){
     
     
     // 初版时间
-    let firstDate = new Date(volumeData?.editionFirst.iso);
-    let firstYear = firstDate?.getFullYear();
-    let firstMonth = firstDate?.getMonth()+1;
+    let firstDate
+    if(volumeData?.editionFirst?.iso){
+        firstDate = new Date(volumeData?.editionFirst.iso);
+    }
+    let firstYear = firstDate&&firstDate?.getFullYear();
+    let firstMonth = firstDate&&(firstDate?.getMonth()+1);
     // 本版时间印次
-    let currentDate = new Date(volumeData?.editionDate.iso);
-    let currentYear = currentDate?.getFullYear();
-    let currentMonth = currentDate?.getMonth()+1;
+    let currentDate
+    if(volumeData?.editionDate?.iso){
+        currentDate = new Date(volumeData?.editionDate.iso);
+    }
+    let currentYear = currentDate&&currentDate?.getFullYear();
+    let currentMonth = currentDate&&(currentDate?.getMonth()+1);
     // 最新时间印次
-    let latestDate = new Date(volumeData?.printDate.iso);
-    let latestYear = latestDate?.getFullYear();
-    let latestMonth = latestDate?.getMonth()+1;
+    let latestDate
+    if(volumeData?.printDate?.iso){
+        latestDate = new Date(volumeData?.printDate.iso);
+    }
+    let latestYear = latestDate&&latestDate?.getFullYear();
+    let latestMonth = latestDate&&(latestDate?.getMonth()+1);
+
     let latestNum = volumeData?.printNumber || "";
     let currentNum = volumeData?.editionNumber || "";
     let printSum = volumeData?.printSum?volumeData?.printSum+"万":"" || "";
@@ -264,14 +274,14 @@ function fixVolumeData(json,volumeData,index){
   
     json.importantProject = importantProject
     json.firstDate = firstDate
-    json.firstYear = firstYear
-    json.firstMonth = firstMonth
+    json.firstYear = firstYear || ""
+    json.firstMonth = firstMonth || ""
     json.currentDate = currentDate
-    json.currentYear = currentYear
-    json.currentMonth = currentMonth
+    json.currentYear = currentYear || ""
+    json.currentMonth = currentMonth || ""
     json.latestDate = latestDate
-    json.latestYear = latestYear
-    json.latestMonth = latestMonth
+    json.latestYear = latestYear || ""
+    json.latestMonth = latestMonth || ""
     json.currentNum = currentNum
     json.latestMonth = latestMonth
     json.latestNum = latestNum

+ 3 - 2
server/cloud/tbook/test/test-export.js

@@ -22,8 +22,9 @@ async function main(){
         // console.log(await exportProcessReportDocs("FR7KZtefyR"))
         // console.log("测试列表")
         // console.log(await exportProcessReportDocs(null,["9V575dapEM"]))
-        // console.log(await exportProcessReportDocs(null,["F8eiOAfuC3"]))
-        console.log(await exportProcessReportDocs(null,["Oa1yB6n64u","j4pt2MMTXM","jAMGxwrl1F","BwZpEoOtS8","X10kCktA0r"]))
+        console.log(await exportProcessReportDocs(null,["uT4YFyP56q"]))
+        
+        // console.log(await exportProcessReportDocs(null,["Oa1yB6n64u","j4pt2MMTXM","jAMGxwrl1F","BwZpEoOtS8","X10kCktA0r"]))
         // console.log(await exportProcessReportDocs(null,["BwZpEoOtS8","X10kCktA0r"]))
     }catch(err){
         console.error(err)

+ 1 - 1
server/lib/docs/index.js

@@ -169,7 +169,7 @@ async function downloadUrl(url) {
         await Promise.all(plist);
         merge = true;
     }
-    let filePathList = mergeFiles.map((item,index)=>mergeFileMap[index]).filter(item=>item)
+    let filePathList = mergeFiles?.map((item,index)=>mergeFileMap[index]).filter(item=>item)
 
     console.log("DOWNLOADED:",filePathList)
     try {