Merge branch 'master' of http://git.fmode.cn:3000/bin/edu-textbook

server/cloud/tbook/func-tbook-export.js

@@ -234,7 +234,8 @@ export async function exportProcessReportDocs(processId,bookList) {
 
 module.exports.exportProcessReportDocs = exportProcessReportDocs
 
-function fixVolumeData(json,volumeData,index,totalJson){
+function fixVolumeData(json,volumeData,index,totalJson,isChildren){
+    let volumeIndex = index;
     json.index = index + 1;
     // 教材基本信息
 
@@ -346,7 +347,11 @@ function fixVolumeData(json,volumeData,index,totalJson){
          item.index = index + 1
          item.birth = toYearMonth(item?.birth)
          if(item?.examine){
-            totalJson.examineList = pushDistinctItem(totalJson.examineList,item)
+            if(!(isChildren&&volumeIndex==0)){ // 子册第一册不重复导出
+                // totalJson.examineList = pushDistinctItem(totalJson.examineList,item) // 名称去重
+                console.log(item)
+                totalJson.examineList.push(item); // 全量导出
+            }
          }
          return item
      })
@@ -356,7 +361,11 @@ function fixVolumeData(json,volumeData,index,totalJson){
     // 其他编者政治审查表
     totalJson.otherList = totalJson.otherList || []
     if(volumeData?.otherEditor){
-        totalJson.otherList = pushDistinctItem(totalJson.otherList,volumeData?.otherEditor)
+        if(!(isChildren&&volumeIndex==0)){ // 子册第一册不重复导出
+            // totalJson.otherList = pushDistinctItem(totalJson.otherList,volumeData?.otherEditor) // 名称去重
+            console.log(volumeData?.otherEditor)
+            totalJson.otherList.push(volumeData?.otherEditor); //全量导出
+        }
     }
 
     // 成果列表
@@ -432,7 +441,7 @@ function renderReportDocsByTextbook(textbook){
     for (let index = 0; index < 12; index++) {
         if(json?.childrens?.[index]){
             let volumeData = json?.childrens?.[index]
-            volumeData = fixVolumeData(volumeData,volumeData,index,json)
+            volumeData = fixVolumeData(volumeData,volumeData,index,json,true)
             volumeList.push(volumeData)
         }
     }

server/cloud/tbook/test/test-export.js

@@ -45,6 +45,13 @@ async function main(){
         // console.log(await exportProcessReportDocs(null,["tnEfUnTaQU"])) // C/C++ pathname error
         // console.log(await exportProcessReportDocs(null,["2s353GQBjk"]))
         // console.log(await exportProcessReportDocs(null,["KvvN9lWhri"]))
+        // console.log(await exportProcessReportDocs(null,["orBBW42ZCn"])) // rar attach
+        // console.log(await exportProcessReportDocs(null,["UwPtEptZTR"])) // pdf 七 八 加密
+        // console.log(await exportProcessReportDocs(null,["TsjBrECA4m"])) // pdf 加密
+        // console.log(await exportProcessReportDocs(null,["z7yhFusOns"])) 
+        // console.log(await exportProcessReportDocs(null,["ybzJWkXqQG"])) 
+        // console.log(await exportProcessReportDocs(null,["4UAwQ4nc5A"])) 
+        console.log(await exportProcessReportDocs(null,["ybzJWkXqQG"])) 
         
         
         // console.log(await exportProcessReportDocs(null,["3wJSkW9HNV"]))