for model统一注册

modules/reports/models/rpt_cfg.js

@@ -43,6 +43,7 @@ let RptCfgSchema = new Schema({
     "formats" : [FormatSchema]
 });
 
-let Rpt_Cfg_Mdl = mongoose.model("rpt_cfg", RptCfgSchema, "rpt_cfg");
+mongoose.model("rpt_cfg", RptCfgSchema, "rpt_cfg");
+// let Rpt_Cfg_Mdl = mongoose.model("rpt_cfg", RptCfgSchema, "rpt_cfg");
 
-export {Rpt_Cfg_Mdl as default};
+// export {Rpt_Cfg_Mdl as default};

modules/reports/models/rpt_mapping_field.js

@@ -19,4 +19,4 @@ let MapFieldSchema = new mongoose.Schema({
 
 let Rpt_Map_Field_Mdl = mongoose.model("rpt_mapping_field", MapFieldSchema, "rpt_mapping_field");
 
-export {Rpt_Map_Field_Mdl as default};
+// export {Rpt_Map_Field_Mdl as default};

modules/reports/models/rpt_template.js

@@ -29,4 +29,4 @@ let RptTemplateSchema = new Schema({
 
 let Template = mongoose.model("rpt_templates", RptTemplateSchema, "rpt_templates");
 
-export {Template as default};
+// export {Template as default};

modules/reports/models/rpt_tpl_data_demo.js

@@ -35,4 +35,4 @@ let TemplateData = mongoose.model("rpt_temp_tpl_data", RptTemplateDataSchema, "r
 //
 // module.exports = new RplTplDataDAO();
 
-export {TemplateData as default};
+// export {TemplateData as default};

modules/reports/models/tpl_tree_node.js

@@ -41,10 +41,11 @@ RptTplTreeSchema.statics.findAndModify = function (query, sort, doc, options, ca
     return this.collection.findAndModify(query, sort, doc, options, callback);
 };
 
+mongoose.model("rpt_tpl_tree", RptTplTreeSchema, "rpt_tpl_tree");
 /*
 let TreeNodeModel = mongoose.model("rpt_tpl_tree", TreeNodeSchema, "rpt_tpl_tree");
 /*/
-let TreeNodeModel = mongoose.model("rpt_tpl_tree", RptTplTreeSchema, "rpt_tpl_tree");
+// let TreeNodeModel = mongoose.model("rpt_tpl_tree", RptTplTreeSchema, "rpt_tpl_tree");
 //*/
 
-export {TreeNodeModel as default};
+// export {TreeNodeModel as default};

modules/reports/models/rpt_tpl_data.js

@@ -1,35 +0,0 @@
-/**
- * Created by Tony on 2017/7/24.
- */
-
-import mongoose from "mongoose";
-let Schema = mongoose.Schema;
-
-let rptTplPrjSchema = new Schema({
-    "ID": Number,
-    "ParentID": Number,
-    "NextSiblingID": Number,
-    "name": String,         //项目名称
-    "location": String,     //工程地点
-    "constructCompany": String,  //建设单位
-    "supervisor": String,   //监理
-    "auditor": String       //审核
-});
-
-let rptTplBillsSchema = new Schema({
-
-});
-
-let rptTplRationSchema = new Schema({
-
-});
-
-let tplPrjData = mongoose.model("tpl_data_projects", rptTplPrjSchema, "projects");
-let tplBillsData = mongoose.model("tpl_data_bills", rptTplBillsSchema, "bills");
-let tplRationData = mongoose.model("tpl_data_ration", rptTplRationSchema, "ration");
-
-module.exports = {
-    prjMdl: tplPrjData,
-    billsMdl: tplBillsData,
-    rationMdl: tplRationData
-};

test/unit/reports/rpt_tpl_tree_test.js

@@ -7,7 +7,7 @@ let config = require("../../../config/config.js");
 //config.setupDb(process.env.NODE_ENV);
 config.setupDb('qa');
 import dbm from "../../../config/db/db_manager";
-import mdl from "../../../modules/reports/models/tpl_tree_node";
+import mdl from "../../../modules/all_models/tpl_tree_node";
 import rttFacade from "../../../modules/reports/facade/rpt_tpl_tree_node_facade";
 
 dbm.connect();

test/unit/reports/testRpt.js

@@ -4,8 +4,8 @@
 var test = require('tape');
 var mongoose = require('mongoose');
 var JV = require('../../../modules/reports/rpt_component/jpc_value_define');
-var Template = require('../../../modules/reports/models/rpt_template');
-var TemplateData = require('../../../modules/reports/models/rpt_tpl_data_demo');
+var Template = require('../../../modules/all_models/rpt_template');
+var TemplateData = require('../../../modules/all_models/rpt_tpl_data_demo');
 var JpcEx = require('../../../modules/reports/rpt_component/jpc_ex');
 var rptUtil = require("../../../modules/reports/util/rpt_util");
 var fs = require('fs');