Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/controller/report_controller.js

@@ -195,6 +195,8 @@ module.exports = app => {
             const roleRelArr = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids)) : [];
             // const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id)) : [];
             const pageRstArr = await getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
+            await this.ctx.helper.recursiveMkdirSync(this.app.baseDir + '/app/public/download');
+
             const runnableRst = [];
             for (let idx = 0; idx < pageRstArr.length; idx++) {
                 let roleRel = null;
@@ -229,6 +231,7 @@ module.exports = app => {
             }
             const roleRelArr = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids)) : [];
             const pageRstArr = await getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
+            await this.ctx.helper.recursiveMkdirSync(this.app.baseDir + '/app/public/download');
             const runnableRst = [];
             let rptRoleRelArr = [];
             const reAssignSignatureName = function(pageData, roleRel, rpt_name_key) {
@@ -288,6 +291,8 @@ module.exports = app => {
             try {
                 const rptNameURI = encodeURI(rptName);
                 const filePath = this.app.baseDir + '/app/public/download/';
+                // console.log('filePath: ' + filePath);
+                // await this.ctx.helper.recursiveMkdirSync(this.app.baseDir + '/app/public/download');
                 const filestream = fs.createReadStream(filePath + uuid + suffix);
                 const chunk = await getUuidFile(filestream);
                 ctx.set({
@@ -318,8 +323,8 @@ async function getReportData(ctx, params, filters, memFieldKeys) {
     const runnableKey = []; // 这个配合runnableRst用，未来考虑并行查询优化
     // console.log('params');
     // console.log(params);
-    console.log('memFieldKeys');
-    console.log(memFieldKeys);
+    // console.log('memFieldKeys');
+    // console.log(memFieldKeys);
     for (const filter of filters) {
         if (runnableKey.indexOf(filter) < 0) {
             switch (filter) {

app/reports/util/rpt_calculation_data_util.js

@@ -239,7 +239,7 @@ class Rpt_Data_Extractor {
         assembleFields(tpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS_EX], rptDataObj[JV.DATA_DETAIL_DATA_EX], $PROJECT);
         // console.log(JV.DATA_DETAIL_DATA_EX);
         // console.log(rptDataObj[JV.DATA_DETAIL_DATA_EX]);
-        fsUtil.writeObjToFile(rptDataObj, 'D:/GitHome/temp/insertedOriginalData.jsp');
+        // fsUtil.writeObjToFile(rptDataObj, 'D:/GitHome/temp/insertedOriginalData.jsp');
         // fsUtil.writeObjToFile(rawDataObj, 'D:/GitHome/temp/insertedRawDataData.jsp');
         // fsUtil.writeObjToFile($PROJECT, 'D:/GitHome/temp/$PROJECTData.jsp');
         // fsUtil.writeObjToFile(tpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS], 'D:/GitHome/temp/masterFieldsAfterAssemble.jsp');