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

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

@@ -111,14 +111,14 @@ export async function exportProcessReportDocs(processId,bookList) {
     let textbookList
     if(processId){ // 流程读取教材列表
         let query = new Parse.Query("EduTextbook")
-        query.include("childrens")
+        query.include("childrens","department")
         query.equalTo("recommend",true);
         query.equalTo("eduProcess",processId);
         textbookList = await query.find();
     }
     if(bookList?.length){ // 直接导出教材列表
         let query = new Parse.Query("EduTextbook")
-        query.include("childrens")
+        query.include("childrens","department")
         query.containedIn("objectId",bookList);
         textbookList = await query.find();
     }
@@ -170,20 +170,7 @@ function fixVolumeData(json,volumeData,index){
     let majorCode6 = volumeData?.major?.code?.slice(0,6) || json?.major?.code?.slice(0,6)  || ""
     let majorName6 = volumeData?.major?.name || json?.major?.name || ""
     
-    // 是否重点立项
-    let importantProject = volumeData?.importantProject?.join();
-
-    let isJC = circleCheck[(volumeData?.approval?.indexOf("基础")>-1)?1:0];
-    let isZL = circleCheck[(volumeData?.approval?.indexOf("战略")>-1)?1:0];
     
-    let is101 = circleCheck[(volumeData?.approval?.indexOf("101计划")>-1)?1:0]; // 2024新重点
-    let isZY = circleCheck[(volumeData?.approval?.indexOf("中央")>-1)?1:0];
-    let isSX = circleCheck[(volumeData?.approval?.indexOf("四新")>-1)?1:0];
-    let isJS = circleCheck[(volumeData?.approval?.indexOf("建设")>-1)?1:0];
-
-
-    let isNotImpt = (volumeData?.approval?.indexOf("101计划")==-1) && (volumeData?.approval?.indexOf("中央")==-1) && (volumeData?.approval?.indexOf("四新")==-1) && (volumeData?.approval?.indexOf("建设")==-1)
-    isNotImpt = circleCheck[isNotImpt?1:0];
     // 初版时间
     let firstDate = new Date(volumeData?.editionFirst.iso);
     let firstYear = firstDate?.getFullYear();
@@ -199,19 +186,14 @@ function fixVolumeData(json,volumeData,index){
     let latestNum = volumeData?.printNumber || "";
     let currentNum = volumeData?.editionNumber || "";
     let printSum = volumeData?.printSum?volumeData?.printSum+"万":"" || "";
+    // 是否重点立项
+    let importantProject = volumeData?.importantProject?.join();
     // 初版至今重点项目
     let isBSQT =  !((importantProject?.indexOf("建设")>-1) || (importantProject?.indexOf("本科国家")>-1) || (importantProject?.indexOf("省级优秀")>-1) || (importantProject?.indexOf("省级规划")>-1))// 是否其他省级奖项
     let bsqtName = (volumeData?.importantProject || [])?.filter(item=>(item?.indexOf("建设")==-1&&item?.indexOf("本科国家")==-1&&item?.indexOf("省级优秀")==-1&&item?.indexOf("省级规划")==-1));
     
   
     json.importantProject = importantProject
-    json.isJC = isJC
-    json.isZL = isZL
-    json.is101 = is101
-    json.isZY = isZY
-    json.isSX = isSX
-    json.isJS = isJS
-    json.isNotImpt = isNotImpt
     json.firstDate = firstDate
     json.firstYear = firstYear
     json.firstMonth = firstMonth
@@ -251,6 +233,8 @@ function fixVolumeData(json,volumeData,index){
     json.latestM = latestMonth;
     json.currentY = currentYear;
     json.currentM = currentMonth;
+
+    json.isGJS = circleCheck[(importantProject?.indexOf("建设")>-1)?1:0];
     json.isBGJ = circleCheck[(importantProject?.indexOf("本科国家")>-1)?1:0];
     json.isBSYX = circleCheck[(importantProject?.indexOf("省级优秀")>-1)?1:0];
     json.isBSGH = circleCheck[(importantProject?.indexOf("省级规划")>-1)?1:0];
@@ -385,6 +369,8 @@ function renderReportDocsByTextbook(textbook){
     // console.log(codeBarImg)
     // （其他佐证材料，限两份以内。）
     console.log(codePngPath)
+    let isNotImpt = (json?.approval?.indexOf("101计划")==-1) && (json?.approval?.indexOf("中央")==-1) && (json?.approval?.indexOf("四新")==-1) && (json?.approval?.indexOf("建设")==-1);
+    
 
     let fixData = {
         volumeList:volumeList,
@@ -394,7 +380,7 @@ function renderReportDocsByTextbook(textbook){
         titlePad:padString(json?.title,21),
         ISBNPad:padString(json?.ISBN,21),
         ISBN:json?.ISBN,
-        inviteUnit:json?.inviteUnit||"",
+        inviteUnit:json?.inviteUnit||json?.department?.name||"",
         one:squareCheck[(json?.type=="单本"||json?.type=="单册")?1:0], // 单本/单册 方框
         full:squareCheck[json?.type=="全册"?1:0], // 全册
         oneCircle:circleCheck[(json?.type=="单本"||json?.type=="单册")?1:0], // 单本/单册 圆圈
@@ -408,6 +394,15 @@ function renderReportDocsByTextbook(textbook){
         // 基本信息
         title:json?.title,
 
+        isJC: circleCheck[(json?.approval?.indexOf("基础")>-1)?1:0],
+        isZL: circleCheck[(json?.approval?.indexOf("战略")>-1)?1:0],
+    
+        is101: circleCheck[(json?.approval?.indexOf("101计划")>-1)?1:0], // 2024新重点
+        isZY: circleCheck[(json?.approval?.indexOf("中央")>-1)?1:0],
+        isSX: circleCheck[(json?.approval?.indexOf("四新")>-1)?1:0],
+        isJS: circleCheck[(json?.approval?.indexOf("建设")>-1)?1:0],
+        isNotImpt: circleCheck[isNotImpt?1:0],
+
         // 教材适用情况
         lessons:json?.lessons||[],
         period:json?.period||"", // 学时
@@ -415,7 +410,7 @@ function renderReportDocsByTextbook(textbook){
         isXX:squareCheck[(characteristic?.indexOf("选修")>-1)?1:0],
         isTS:circleCheck[(characteristic?.indexOf("通识")>-1)?1:0],
         isGG:circleCheck[(characteristic?.indexOf("公共")>-1)?1:0],
-        isZY:circleCheck[(characteristic?.indexOf("专业")>-1)?1:0],
+        isZYK:circleCheck[(characteristic?.indexOf("专业")>-1)?1:0],
         isSXZZ:squareCheck[(characteristic?.indexOf("思想")>-1)?1:0],
         isSY:squareCheck[(characteristic?.indexOf("实验")>-1)?1:0],
         // 作者列表

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

@@ -22,7 +22,7 @@ async function main(){
         // console.log(await exportProcessReportDocs("FR7KZtefyR"))
         // console.log("测试列表")
         // console.log(await exportProcessReportDocs(null,["9V575dapEM"]))
-        console.log(await exportProcessReportDocs(null,["3vSurc0lUy"]))
+        console.log(await exportProcessReportDocs(null,["BwZpEoOtS8","X10kCktA0r"]))
     }catch(err){
         console.error(err)
     }