ryanemax 6 сар өмнө
parent
commit
c7c97fa06b

+ 5 - 3
server/cloud/tbook/func-tbook-export.js

@@ -605,7 +605,8 @@ function renderReportDocsByTextbook(textbook){
     })
     // console.log(bookData)
     // console.log(json)
-    let tempFileName = path.join(`${bookid}_${json.title}_申报书及附件.docx`)
+    let title = bookData.title?.replaceAll("/","")
+    let tempFileName = path.join(`${bookid}_${title}_申报书及附件.docx`)
 
 
     // mergeFiles 处理七八九是否签名或后置问题
@@ -616,7 +617,7 @@ function renderReportDocsByTextbook(textbook){
     lastPageList.push(json?.authorSignPDF?.url||docx7);
     lastPageList.push(json?.unitMaterial?.url||docx8);
     lastPageList.push(docx9);
-    let lastPageFileName = path.join(bookTempDir,`${bookid}_${bookData.title}_申报书及附件_789.pdf`)
+    let lastPageFileName = path.join(bookTempDir,`${bookid}_${title}_申报书及附件_789.pdf`)
     console.log(lastPageList)
     let lastPagePdf = await docxToPdf(null,lastPageFileName,{mergeFiles:lastPageList,tempDir:bookTempDir,mergeAll:true}) // 成功用pdf,失败继续用docx
     docx7&&fs.rmSync(docx7)
@@ -668,7 +669,8 @@ function renderReportDocsByTextbook(textbook){
 
 async function getPageDocx(bookid,pageName,bookData){
     let tplPath = path.join(TemplateDocxDir,`模板-本科教材申报书-${pageName}.docx`);
-    let tempFileName = path.join(`${bookid}_${bookData.title}_申报书及附件_${pageName}.docx`);
+    let title = bookData?.title?.replaceAll("/","")
+    let tempFileName = path.join(`${bookid}_${title}_申报书及附件_${pageName}.docx`);
     let filePath = renderDocx(tplPath,tempFileName,bookData);
     return filePath;
     // 转pdf

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

@@ -3,7 +3,8 @@ Parse.initialize("edu-textbook");
 Parse.serverURL = "http://8.140.98.43/parse";
 global.Parse = Parse;
 
-
+import path from "path";
+import { mergePdfListReduce } from "../../../lib/docs";
 /**
  * 
  (npx vite build) -and (node temp/test-export.js)
@@ -40,7 +41,8 @@ async function main(){
         // console.log(await exportProcessReportDocs(null,["sbVgvo4qEk"]))
         // console.log(await exportProcessReportDocs(null,["4LnH46Mu03"]))
         // console.log(await exportProcessReportDocs(null,["xdIAG8BYnX"]))
-        console.log(await exportProcessReportDocs(null,["NJ2hWa17gi"]))
+        // console.log(await exportProcessReportDocs(null,["NJ2hWa17gi"]))
+        console.log(await exportProcessReportDocs(null,["tnEfUnTaQU"]))
         
         
         // console.log(await exportProcessReportDocs(null,["3wJSkW9HNV"]))
@@ -55,4 +57,17 @@ async function main(){
         console.error(err)
     }
 }
-main()
+main()
+
+// mergePdfListReduce([
+//     path.join("/home/ryan/workspace/nova/edu-textbook/server/cloud/tbook/template/模板-推荐申报表.docx"),
+//     path.join("/home/ryan/workspace/nova/edu-textbook/server/cloud/tbook/template/模板-推荐申报表.docx")
+// ],{
+//     files: [
+//       '/home/ryan/workspace/nova/edu-textbook/server/cloud/tbook/test/temp/temp/112_1f15d43c0534288c61089099792e44e7.docx'
+//     ],
+//     properties: { pageSize: 'A4', margin: { top: 0, right: 0, bottom: 0, left: 0 } },
+//     pdfa: false,
+//     pdfUA: false,
+//     merge: true
+//   });