rpt tpl tuning

modules/reports/controllers/rpt_controller.js

@@ -7,7 +7,8 @@ let mongoose = require('mongoose');
 let JV = require('../rpt_component/jpc_value_define');
 
 let Template = mongoose.model('rpt_templates');
-let demoTemplateData = mongoose.model('rpt_temp_tpl_data');
+let rptTplFacade = require('../facade/rpt_template_facade');
+let demoTemplateFacade = require('../facade/rpt_tpl_data_demo_facade');
 
 let JpcEx = require('../rpt_component/jpc_ex');
 let rptUtil = require("../util/rpt_util");
@@ -26,14 +27,13 @@ let callback = function(req, res, err, data){
     }
 };
 
-function getAllPagesCommon(req, res, rpt_id, pageSize, cb) {
+function getAllPagesCommonOrg(req, res, rpt_id, pageSize, cb) {
     let rptTpl = null;
-    Template.findOne({ID: rpt_id}, '-_id').exec().then(function(rst) {
+    rptTplFacade.getRptTemplate(rpt_id).then(function(rst) {
         rptTpl = rst;
         if (rptTpl) {
             if (rptTpl.ID_KEY) {
-                //return demoTemplateData.getPromise(rptTpl.ID_KEY);
-                return demoTemplateData.findOne({"Data_Key": rptTpl.ID_KEY}).exec();
+                return demoTemplateFacade.getDemoData(rptTpl.ID_KEY);
             } else {
                 callback(req, res, 'No report template data were found!', null);
             }
@@ -61,11 +61,42 @@ function getAllPagesCommon(req, res, rpt_id, pageSize, cb) {
     );
 };
 
+function getAllPagesCommon(req, res, rpt_id, pageSize, cb) {
+    let rptTpl = null;
+    rptTplFacade.getRptTemplate(rpt_id).then(function(rst) {
+        rptTpl = rst;
+        if (rptTpl) {
+            let tplData = {};
+            if (rptTpl[JV.NODE_FIELD_MAP]) {
+                //1. 离散数据
+                if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DISCRETE_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DISCRETE_FIELDS].leng > 0) {
+                    tplData[JV.DATA_DISCRETE_DATA] = [];
+                }
+                //2. 主数据
+                if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_MASTER_FIELDS].leng > 0) {
+                    tplData[JV.DATA_MASTER_DATA] = [];
+                }
+                //3. 从数据
+                if (rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS] && rptTpl[JV.NODE_FIELD_MAP][JV.NODE_DETAIL_FIELDS].leng > 0) {
+                    tplData[JV.DATA_DETAIL_DATA] = [];
+                }
+                //return demoTemplateData.getPromise(rptTpl.ID_KEY);
+                //return demoTemplateData.findOne({"Data_Key": rptTpl.ID_KEY}).exec();
+
+            } else {
+                callback(req, res, 'No report template data were found!', null);
+            }
+        } else {
+            callback(req, res, 'No report template was found!', null);
+        }
+    })
+};
+
 module.exports = {
     getReportAllPages: function(req, res){
         let rpt_id = req.body.ID;
         let pageSize = req.body.pageSize;
-        getAllPagesCommon(req, res, rpt_id, pageSize, function(pageRst){
+        getAllPagesCommonOrg(req, res, rpt_id, pageSize, function(pageRst){
             //fs.writeFileSync('D:/GitHome/ConstructionOperation/tmp/testRpt.js', JSON.stringify(pageRst));
             callback(req, res, null, pageRst);
         })
@@ -76,7 +107,7 @@ module.exports = {
             rptName = req.params.rptName,
             isOneSheet = req.params.isOneSheet;
         ;
-        getAllPagesCommon(req, res, rpt_id, pageSize, function(pageRst){
+        getAllPagesCommonOrg(req, res, rpt_id, pageSize, function(pageRst){
             rpt_xl_util.exportExcel(pageRst, pageSize, rptName, isOneSheet, function(newName){
                 res.setHeader('Content-Type', 'application/vnd.openxmlformats');
                 res.setHeader("Content-Disposition", "attachment; filename=" + strUtil.getPinYinCamelChars(rptName) + ".xlsx");

modules/reports/facade/rpt_template_facade.js

@@ -0,0 +1,15 @@
+/**
+ * Created by Tony on 2017/8/9.
+ */
+let mongoose = require("mongoose");
+let rpt_tpl_mdl = mongoose.model("rpt_templates");
+
+module.exports = {
+    getRptTemplate: getRptTemplate
+};
+
+async function getRptTemplate(tplId) {
+    //console.log('templateId: ' + parseInt(tplId));
+    let rst = await  rpt_tpl_mdl.findOne({"ID": parseInt(tplId)}, '-_id');
+    return rst;
+}

modules/reports/facade/rpt_tpl_data_demo_facade.js

@@ -0,0 +1,14 @@
+/**
+ * Created by Tony on 2017/8/9.
+ */
+let mongoose = require("mongoose");
+let rpt_tpl_data_demo_mdl = mongoose.model("rpt_temp_tpl_data");
+
+module.exports = {
+    getDemoData: getDemoData
+};
+
+async function getDemoData(dataKey) {
+    let rst = await  rpt_tpl_data_demo_mdl.findOne({"Data_Key": dataKey});
+    return rst;
+}

modules/reports/facade/rpt_tpl_data_facade.js

@@ -0,0 +1,6 @@
+/**
+ * Created by Tony on 2017/8/9.
+ */
+
+let mongoose = require("mongoose");
+let rpt_tpl_mdl = mongoose.model("rpt_templates");

modules/reports/models/rpt_mapping_field.js

@@ -4,14 +4,15 @@
 let mongoose = require('mongoose');
 let MapFieldSchema = new mongoose.Schema({
     "fieldMapGrpName" : String,
-    "dispName": String,
+    "Name": String,
     "remark" : String,
     "seq" : Number,
     "items" : [{
-        mapId: Number,
-        dispName: String,
-        mapExpression: String,
-        descr: String
+        "ID": Number,
+        "Name": String,
+        "mapExpression": String,
+        "adHocFormula": {"run_type": String, "expression": String, "format": String},
+        "descr": String
     }]
 });
 

web/maintain/report/js/rpt_tpl_field_map.js

@@ -105,7 +105,8 @@ let fieldMapTreeOprObj = {
         rst[JV.PROP_NAME] = node[JV.PROP_NAME];
         rst[JV.PROP_DATA_TYPE] = node[JV.PROP_DATA_TYPE];
         rst.mapExpression = node.mapExpression;
-        rst[JV.PROP_ID] = node[JV.PROP_ID];
+        rst.adHocFormula = node.adHocFormula;
+        rst.descr = node.descr;
         return rst;
     }
 };