code sync

modules/reports/controllers/rpt_controller.js

@@ -285,6 +285,20 @@ async function getAllPagesCommon(user_id, prj_id, prj_ids, rpt_id, pageSize, ori
                             destData[JV.DATA_DETAIL_DATA_EX][idx] = destData[JV.DATA_DETAIL_DATA_EX][idx].concat(srcData[JV.DATA_DETAIL_DATA_EX][idx]);
                         }
                     };
+                    // let multiRawData = rptTplDataFacade.prepareMultiProjectData(user_id, prj_ids, filter);
+                    // //终于出来结果了 !_! (multiRawData是多个单位工程的原始数据！)
+                    // if (multiRawData.length > 0) {
+                    //     //考虑到工料机的数据还需要再计算，所以还不能直接用，需要每个工程都处理一遍后，再合并
+                    //     let tplData = rptDataUtil.assembleData(multiRawData[0]);
+                    //     for (let idx = 1; idx < multiRawData.length; idx++) {
+                    //         let tmpData = rptDataUtil.assembleData(multiRawData[idx]);
+                    //         _combineData(tplData, tmpData);
+                    //     }
+                    //     _createPntPageData(tplData, rptTpl);
+                    // } else {
+                    //     cb('Have errors while on going...', null);
+                    // }
+
                     rptTplDataFacade.prepareMultiProjectData(user_id, prj_ids, filter).then(function(multiRawData) {
                         //终于出来结果了 !_! (multiRawData是多个单位工程的原始数据！)
                         if (multiRawData.length > 0) {

web/building_saas/report/js/rpt_main.js

@@ -259,9 +259,10 @@ let zTreeOprObj = {
             if (treeNode.hasOwnProperty('flags')) {
                 if (treeNode.flags.hasOwnProperty('auditType') && treeNode.flags.auditType === 'audit_compare') {
                     let pids = await compareObject.getCompareID();
-                    if (pids.length > 0) {
+                    if (pids !== null && pids.length > 0) {
                         params.prj_ids = pids;
                     } else {
+                        // params.prj_ids = [25062, 25082]; // hard code 测试项目：酉阳县东部沿海产业转移承接基地建设项目（一期）一标段 + 审定
                         alert('未设置审核对比项目！');
                         exit;
                     }
@@ -835,4 +836,28 @@ function dynamicLoadCss(url) {
     link.rel = 'stylesheet';
     link.href = url;
     head.appendChild(link);
+}
+
+function _getCommonParams(treeNode) {
+    let rstParmas = {};
+    rstParmas.pageSize = rptControlObj.getCurrentPageSize();
+    rstParmas.rpt_tpl_id = treeNode.refId;
+    if (zTreeOprObj.checkedRptTplNodes && zTreeOprObj.checkedRptTplNodes.length > 0) {
+        let refRptTplIds = [];
+        for (let node of zTreeOprObj.checkedRptTplNodes) {
+            refRptTplIds.push(node.refId);
+            let flag = null;
+            if (node.hasOwnProperty('flags')) {
+                flag = node.flags;
+                params.prj_ids = rptTplObj.getAllPrjIds();
+            }
+            flags.push(flag);
+        }
+        params.rpt_ids = refRptTplIds;
+    }
+    params.prj_id = projectObj.project.projectInfo.ID;
+
+    rstParmas.prj_id = projectObj.project.projectInfo.ID;
+    // rstParmas.custCfg = me.reportPageCfg;
+    return rstParmas;
 }