Browse Source

有导出PDF异常,Try处理

TonyKang 6 years ago
parent
commit
9262a230c5

+ 16 - 11
modules/reports/controllers/rpt_controller.js

@@ -578,17 +578,22 @@ module.exports = {
             let r_name = rpt_names[idx];
             parallelFunctions.push((function (rpt_id, rpt_name) {
                 return function (cb) {
-                    getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, dftOption, JV.OUTPUT_TYPE_PDF, function (err, pageRst) {
-                        if(err){
-                            cb(err);
-                        }
-                        else{
-                            rpt_pdf_util.export_pdf_file(pageRst, pageSize, rpt_name, function(uuidName){
-                                let fileRst = {uuid: uuidName, reportName: rpt_name};
-                                cb(err, fileRst);
-                            })
-                        }
-                    })
+                    try {
+                        getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, dftOption, JV.OUTPUT_TYPE_PDF, function (err, pageRst) {
+                            if(err){
+                                cb(err);
+                            }
+                            else{
+                                rpt_pdf_util.export_pdf_file(pageRst, pageSize, rpt_name, function(uuidName){
+                                    let fileRst = {uuid: uuidName, reportName: rpt_name};
+                                    cb(err, fileRst);
+                                })
+                            }
+                        })
+                    } catch (ex) {
+                        console.log(ex);
+                        cb("Occurs exception while creating PDF file!");
+                    }
                 }
             })(parseInt(r_id), r_name));
         }

+ 2 - 2
test/unit/reports/test_rpt_test_template.js

@@ -37,8 +37,8 @@ let demoPrjId = - 1;
 // let demoRptId = 23; //04 综合费率表
 
 // let demoRptId = 56; //24
-let demoRptId = 36; //5.1
-
+// let demoRptId = 36; //5.1
+let demoRptId = 49; //5.5
 
 let pagesize = "A4";
 //288: 11-2表(新)