zhangweicheng 7 years ago
parent
commit
f3e15a5abd

+ 2 - 1
modules/main/facade/installation_facade.js

@@ -3,7 +3,8 @@
  */
 const mongoose = require('mongoose');
 const installSectionModel = mongoose.model("std_ration_lib_installationSection");
-const installFeeItemModel = mongoose.model("std_ration_lib_installation");let installationFeeModel = mongoose.model("installation_fee");
+const installFeeItemModel = mongoose.model("std_ration_lib_installation");
+let installationFeeModel = mongoose.model("installation_fee");
 let engineeringModel = mongoose.model('engineering_lib');
 const uuidV1 = require('uuid/v1');
 let consts = require('../../main/models/project_consts');

+ 3 - 2
modules/main/models/proj_counter_model.js

@@ -2,12 +2,13 @@
  * Created by Mai on 2017/6/13.
  */
 
+let mongoose = require("mongoose");
 let baseModel = require('./base_model');
-import {default as projCounterSchema, collectionName as collectionName} from "./schemas/proj_counter";
 
+let collectionName = 'projCounter';
 class projCounter extends baseModel {
     constructor() {
-        super(projCounterSchema);
+        super(mongoose.model(collectionName));
         this.collectionName = collectionName;
     }
 

+ 3 - 3
modules/main/models/proj_setting_model.js

@@ -2,14 +2,14 @@
  * Created by Mai on 2017/9/14.
  */
 
+let mongoose = require("mongoose");
 let baseModel = require('./base_model');
-// import {default as projSettingSchema, collectionName as collectionName, settingConst as settingConst} from "./schemas/proj_setting";
-import {default as projSettingSchema, collectionName as collectionName} from "./schemas/proj_setting";
+let collectionName = 'proj_setting';
 
 class projSettingModel extends baseModel {
 
     constructor() {
-        super(projSettingSchema);
+        super(mongoose.model(collectionName));
         this.collectionName = collectionName;
     }
 

+ 0 - 8
modules/main/models/schemas/proj_counter.js

@@ -1,8 +0,0 @@
-/**
- * Created by Mai on 2017/9/15.
- */
-
-let mongoose = require("mongoose");
-let collectionName = 'projCounter';
-let model = mongoose.model(collectionName);
-export {model as default, collectionName as collectionName};

+ 0 - 8
modules/main/models/schemas/proj_setting.js

@@ -1,8 +0,0 @@
-/**
- * Created by Mai on 2017/9/14.
- */
-
-let mongoose = require("mongoose");
-let collectionName = 'proj_setting';
-let model = mongoose.model(collectionName);
-export {model as default, collectionName as collectionName};

+ 0 - 54
modules/std_fee_rate_libs/models/std_fee_rate_libs.js

@@ -1,54 +0,0 @@
-/*
-/!**
- * Created by CSL on 2017-03-22.
- *!/
-
-var mg = require('mongoose');
-var dbm = require("../../../config/db/db_manager");
-var db = dbm.getCfgConnection("scConstruct");
-
-var ratesSchema = new mg.Schema({
-    ID: Number,
-    ParentID: Number,
-    name: String,
-    rate: Number,
-    memo: String
-});
-
-var libsSchema = new mg.Schema({
-    region: String,                     // 工程所在地
-    libID: Number,                     // 费率标准文件ID
-    libName: String,                   // 费率标准文件名称
-    rates: [ratesSchema]                  // 树表结构费率值
-});
-
-var libsModel = db.model('std_fee_rate_libs', libsSchema, 'std_fee_rate_libs');
-
-var StdFeeRateLibs = function(){};
-
-StdFeeRateLibs.prototype.libNames = function(region, controllerFun){
-    libsModel.find({"region": region}, ["libID", "libName"], function(err, data){
-        if(data.length){
-            controllerFun(data);
-        }
-        else{
-            controllerFun(false);
-        }
-    })
-};
-
-StdFeeRateLibs.prototype.rates = function(libID, controllerFun){
-    libsModel.find({"libID": libID}, ["rates"], function(err, data){
-        if(data.length){
-            controllerFun(data);
-        }
-        else{
-            controllerFun(false);
-        }
-    })
-};
-
-module.exports = new StdFeeRateLibs();
-
-
-*/