code for sync

modules/main/models/project_consts.js

@@ -49,6 +49,13 @@ let summaryConstList = [
     `SegmentDetail`
 ];
 
+let projectFieldConstList = [
+    `ProjectCostFields`,
+    `ProjectEcoFields`,
+    `ProjectLabMaterialFields`,
+    `ProjectQtyFields`
+];
+
 let commonConst = {
     UT_UPDATE: 'ut_update',
     UT_CREATE: 'ut_create',
@@ -63,4 +70,13 @@ const rationType = {
     gljRation: 3,
     install:4
 };
-module.exports = {projectConst: projectConst, commonConst: commonConst, projectConstList: projectConstList,gljKeyArray:gljKeyArray,rationKeyArray:rationKeyArray,rationType:rationType, summaryConstList: summaryConstList};
+module.exports = {
+    projectConst: projectConst,
+    commonConst: commonConst,
+    projectConstList: projectConstList,
+    gljKeyArray:gljKeyArray,
+    rationKeyArray:rationKeyArray,
+    rationType:rationType,
+    summaryConstList: summaryConstList,
+    projectFieldConstList: projectFieldConstList
+};

modules/reports/controllers/rpt_controller.js

@@ -11,6 +11,347 @@ let Template = mongoose.model('rpt_templates');
 let rptTplDataFacade = require("../facade/rpt_tpl_data_facade");
 let fsUtil = require("../../../public/fsUtil");
 let pm_facade = require('../../../modules/pm/facade/pm_facade');
+let dummyDataObj = {
+    ProjectCostFields: [{
+        "name": "分部分项工程费",
+        "cost": 728819,
+        "unitCost": 728819,
+        "per": 70.08
+    }, {
+        "name": "技术措施费",
+        "cost": 36807.79,
+        "unitCost": 36807.79,
+        "per": 3.54
+    }, {
+        "name": "安全文明施工费",
+        "cost": 62312.37,
+        "unitCost": 62312.37,
+        "per": 5.99
+    }, {
+        "name": "建设工程竣工档案编制费",
+        "cost": 6867.95,
+        "unitCost": 6867.95,
+        "per": 0.66
+    }, {
+        "name": "其他组织措施费",
+        "cost": 36056.75,
+        "unitCost": 36056.75,
+        "per": 3.47
+    }, {
+        "name": "暂列金额",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "专业工程暂估价",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "计日工",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "总承包服务费",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "索赔与现场签证",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "规费",
+        "cost": 64387.06,
+        "unitCost": 64387.06,
+        "per": 6.19
+    }, {
+        "name": "税金",
+        "cost": 104748.1,
+        "unitCost": 104748.1,
+        "per": 10.07
+    }, {
+        "name": "工程造价",
+        "cost": 1039999.02,
+        "unitCost": 1039999.02,
+        "per": 100
+    }
+    ],
+    ProjectEcoFields: [{
+        "name": "土石方工程",
+        "cost": 31477.97,
+        "unitCost": 29.338,
+        "per": 0.84
+    }, {
+        "name": "地基处理与边坡支护工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "桩基工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "砌筑工程",
+        "cost": 312217.05,
+        "unitCost": 290.995,
+        "per": 8.32
+    }, {
+        "name": "混凝土及钢筋混凝土工程",
+        "cost": 2301974.32,
+        "unitCost": 2145.503,
+        "per": 61.34
+    }, {
+        "name": "金属结构工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "木结构工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "门窗工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "屋面及防水工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "保温、防腐、隔热工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "楼地面装饰工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }, {
+        "name": "其他工程",
+        "cost": 0,
+        "unitCost": 0,
+        "per": 0
+    }
+    ],
+    ProjectLabMaterialFields: [{
+        "name": "综合用工",
+        "unit": "工日",
+        "unitPrice": 118.62,
+        "quantity": 5248.2,
+        "unitIndex": 489.147
+    }, {
+        "name": "土石方用工",
+        "unit": "工日",
+        "unitPrice": 100,
+        "quantity": 176.71,
+        "unitIndex": 16.47
+    }, {
+        "name": "钢材",
+        "unit": "t",
+        "unitPrice": 3079.64,
+        "quantity": 1.68,
+        "unitIndex": 0.157
+    }, {
+        "name": "水泥",
+        "unit": "t",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "商品混凝土",
+        "unit": "m3",
+        "unitPrice": 403,
+        "quantity": 484.59,
+        "unitIndex": 45.165
+    }, {
+        "name": "锯材",
+        "unit": "m3",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "砂",
+        "unit": "t",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "石子",
+        "unit": "t",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "标砖",
+        "unit": "千块",
+        "unitPrice": 4,
+        "quantity": 11.06,
+        "unitIndex": 1.031
+    }, {
+        "name": "砌块",
+        "unit": "m3",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "门",
+        "unit": "m2",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "窗",
+        "unit": "m2",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "保温材料",
+        "unit": "",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "防水材料",
+        "unit": "",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }, {
+        "name": "其它材料",
+        "unit": "",
+        "unitPrice": 0,
+        "quantity": 0,
+        "unitIndex": 0
+    }
+    ],
+    ProjectQtyFields: [{
+        "name": "挖土石方量",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "基础混凝土",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "混凝土桩",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "混凝土柱",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "混凝土梁",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "混凝土有梁板",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "混凝土平板",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "混凝土楼梯",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "混凝土墙",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "屋架",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "砌体",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "楼地面",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "隔热、保温",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "天棚装饰",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "内墙装饰",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "外墙装饰",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "防水",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "门",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "窗",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "钢材",
+        "quantityIndexUnit": "t",
+        "quantity": 0
+    }, {
+        "name": "阳台雨蓬挑檐",
+        "quantityIndexUnit": "m3",
+        "quantity": 0
+    }, {
+        "name": "屋面防水",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "基础模板",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "梁模板",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "柱模板",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "墙模板",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "平板模板",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "楼梯模板",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }, {
+        "name": "其他模板",
+        "quantityIndexUnit": "m2",
+        "quantity": 0
+    }
+    ]
+};
 
 import rptTplFacade from "../facade/rpt_template_facade";
 import demoTemplateFacade from "../facade/rpt_tpl_data_demo_facade";
@@ -222,6 +563,9 @@ function setupCustomizeCfg(customizeCfg, rptTpl, defProperties) {
         }
     }
 }
+function getEcoFieldsData() {
+    return dummyDataObj;
+}
 function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, customizeCfg, option, outputType, cb) {
     let rptTpl = null;
     rptTplFacade.getRptTemplate(rpt_id).then(function(rst) {
@@ -229,9 +573,9 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, custo
         if (rptTpl) {
             let rptDataUtil = new rptDataExtractor();
             rptDataUtil.initialize((rptTpl._doc)?rptTpl._doc:rptTpl);
-            let summaryRst = [];
-            let filter = rptDataUtil.getDataRequestFilter(summaryRst);
-            let promiseArr = [null, null];
+            let summaryRst = [], economicRst = [];
+            let filter = rptDataUtil.getDataRequestFilter(summaryRst, economicRst);
+            let promiseArr = [null, null, null];
             if (summaryRst.length > 0) {
                 if (summaryRst.indexOf(`Construct`) >= 0 || summaryRst.indexOf(`ConstructDetail`) >= 0) {
                     promiseArr[0] = pm_facade.getSummaryInfoByTender(prj_id, pm_facade.projectType.project);
@@ -240,6 +584,9 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, custo
                     promiseArr[1] = pm_facade.getSummaryInfoByTender(prj_id, pm_facade.projectType.engineering);
                 }
             }
+            if (economicRst.length > 0) {
+                promiseArr[2] = getEcoFieldsData();
+            }
             rptTplDataFacade.prepareProjectData(user_id, prj_id, filter, function (err, msg, rawDataObj) {
                 if (!err) {
                     let buildPageData = function() {
@@ -296,6 +643,13 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, custo
                             buildPageData(rawDataObj, rptDataUtil, rptTpl);
                         });
                     } else {
+                        if (promiseArr[2] !== null) {
+                            //暂时这样测试
+                            rawDataObj.prjData.push({moduleName: 'ProjectCostFields', data: promiseArr[2].ProjectCostFields});
+                            rawDataObj.prjData.push({moduleName: 'ProjectEcoFields', data: promiseArr[2].ProjectEcoFields});
+                            rawDataObj.prjData.push({moduleName: 'ProjectLabMaterialFields', data: promiseArr[2].ProjectLabMaterialFields});
+                            rawDataObj.prjData.push({moduleName: 'ProjectQtyFields', data: promiseArr[2].ProjectQtyFields});
+                        }
                         buildPageData(rawDataObj, rptDataUtil, rptTpl);
                     }
                     /*/
@@ -745,3 +1099,4 @@ module.exports = {
 
     }
 };
+

modules/reports/rpt_component/jpc_rte.js

@@ -47,6 +47,24 @@ let JE = {
         }
         return rst;
     },
+    getFieldDataLen: function(field, dataObj) {
+        let rst = 0;
+        if (field.DataNodeName === 'NA') {
+            if (!field[JV.PROP_AD_HOC_DATA]) {
+                field[JV.PROP_AD_HOC_DATA] = [];
+            }
+            rst = field[JV.PROP_AD_HOC_DATA].length;
+        } else {
+            if (!field.DataNodeName) {
+                // that means this is a self-defined discrete field!
+                field.DataNodeName = JV.DATA_DISCRETE_DATA;
+                field.DataSeq = dataObj[JV.DATA_DISCRETE_DATA];
+                dataObj[JV.DATA_DISCRETE_DATA].push([]);
+            }
+            rst = dataObj[field.DataNodeName][field.DataSeq].length;
+        }
+        return rst;
+    },
     setFieldValue: function (field, dataObj, valIdx, newValue) {
         if (field.DataNodeName === "NA") {
             if (!field[JV.PROP_AD_HOC_DATA]) {
@@ -109,10 +127,14 @@ let JE = {
         if (field.DataNodeName === "NA") {
             if (field[JV.PROP_AD_HOC_DATA].length > valIdx && valIdx >= 0) {
                 field[JV.PROP_AD_HOC_DATA].splice(valIdx, 0, newValue);
+            } else if (field[JV.PROP_AD_HOC_DATA].length <= valIdx) {
+                field[JV.PROP_AD_HOC_DATA][field[JV.PROP_AD_HOC_DATA].length] = newValue;
             }
         } else {
             if (dataObj[field.DataNodeName][field.DataSeq].length > valIdx && valIdx >= 0) {
                 dataObj[field.DataNodeName][field.DataSeq].splice(valIdx, 0, newValue);
+            } else if (dataObj[field.DataNodeName][field.DataSeq].length <= valIdx) {
+                dataObj[field.DataNodeName][field.DataSeq][dataObj[field.DataNodeName][field.DataSeq].length] = newValue;
             }
         }
     }

modules/reports/util/rpt_construct_data_util.js

@@ -133,7 +133,7 @@ class Rpt_Data_Extractor {
     };
 
     //-- 根据报表模板映射指标(非离散指标)的定义，罗列出所有需要用到的data对象key，作为数据请求的过滤依据
-    getDataRequestFilter(summaryRst) {
+    getDataRequestFilter(summaryRst, economicRst) {
         let rst = [];
         let tpl = this.rptTpl;
         let pri_func_chk_filter = function (field) {
@@ -177,6 +177,17 @@ class Rpt_Data_Extractor {
                     }
                 }
             }
+            if (economicRst instanceof Array) {
+                for (let key of consts.projectFieldConstList) {
+                    if (economicRst.indexOf(key) < 0) {
+                        if (field[JV.PROP_FIELD_EXP_MAP]) {
+                            if (field[JV.PROP_FIELD_EXP_MAP].indexOf('.' + key + '.') >= 0) {
+                                economicRst.push(key);
+                            }
+                        }
+                    }
+                }
+            }
         };
         let pri_setup_filter = function (FIELD_LIST_KEY) {
             if (tpl[JV.NODE_FIELD_MAP][FIELD_LIST_KEY]) {

test/unit/reports/test_rpt_test_template.js

@@ -49,7 +49,8 @@ let demoPrjId = - 1;
 // let demoRptId = 756; //江西 封1
 // let demoRptId = 710; //qa 01
 // let demoRptId = 931; //qa 内蒙古2017 【扉-1】招标工程量清单扉页
-let demoRptId = 957; //qa 内蒙古2017 12-4
+// let demoRptId = 957; //qa 内蒙古2017 12-4
+let demoRptId = 1006; //qa 重庆2018 A03
 // let demoRptId = 475; //计日工
 // let demoRptId = 551; //表05
 let pagesize = "A4";
@@ -66,7 +67,7 @@ let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // demoPrjId = 2260; //QA:
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //项目名称过长
-demoPrjId = 8417; //
+demoPrjId = 8464; //
 // demoPrjId = 4107; //UAT:
 //*/
 let userId_Dft = userId_Leng;