Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation

modules/all_models/stdRation_lib.js

@@ -4,13 +4,21 @@
 /*标准定额库*/
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
+const oprSchema = require('../all_schemas/opr_schema');
 const RepositoryMapSchema = new Schema({
     "ID": Number,
     "dispName" : String,
     "appType" : String, //如："建筑" / "公路"
     "localeType": String, //如 各个省份 / 部颁
     "descr" : String,
-    "deleted": Boolean
+    "deleted": Boolean,
+    compilationId: String,
+    compilationName: String,
+    gljLib: Number,
+    creator: String,
+    createDate: String,
+    recentOpr: [oprSchema]
+
 });
 
 mongoose.model('std_ration_lib_map', RepositoryMapSchema, 'std_ration_lib_map');

modules/ration_repository/controllers/ration_repository_controller.js

@@ -5,7 +5,7 @@ const mongoose = require('mongoose');
 var rationRepository = require("../models/repository_map");
 import baseController from "../../common/base/base_controller";
 import CompilationModel from "../../users/models/compilation_model";
-const gljMapModel = mongoose.model('std_glj_lib_gljList');
+const gljMapModel = mongoose.model('std_glj_lib_map');
 import async from "async";
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});

modules/ration_repository/models/repository_map.js

@@ -6,7 +6,7 @@ let async = require("async");
 let moment = require('moment');
 const mongoose = require('mongoose');
 let counter = require('../../../public/counter/counter');
-const gljMapModel = mongoose.model('std_glj_lib_gljList');
+const gljMapModel = mongoose.model('std_glj_lib_map');
 const rationRepository = mongoose.model('std_ration_lib_map');
 const rationChapterTreeModel = mongoose.model('std_ration_lib_ration_chapter_trees');
 const rationItemModel = mongoose.model('complementary_ration_items');

modules/std_glj_lib/models/gljMapModel.js

@@ -2,7 +2,7 @@
  * Created by Zhong on 2017/8/11.
  */
 const mongoose = require('mongoose');
-const gljMapModel = mongoose.model('std_glj_lib_gljList');
+const gljMapModel = mongoose.model('std_glj_lib_map');
 const gljModel = mongoose.model('std_glj_lib_gljList');
 const gljClassModel = mongoose.model('std_glj_lib_gljClass');
 const rationRepository = mongoose.model('std_ration_lib_map');

modules/std_glj_lib/models/gljModel.js

@@ -2,7 +2,7 @@
  * Created by Zhong on 2017/8/11.
  */
 const mongoose = require('mongoose');
-const gljMapModel = mongoose.model('std_glj_lib_gljList');
+const gljMapModel = mongoose.model('std_glj_lib_map');
 const gljModel = mongoose.model('std_glj_lib_gljList');
 const gljClassModel = mongoose.model('std_glj_lib_gljClass');
 const gljClassTemplateModel = mongoose.model('std_glj_lib_gljClassTemplate');