整理Schema

modules/all_models/prj_properties.js

@@ -0,0 +1,30 @@
+/**
+ * Created by jimiz on 2017/5/19.
+ */
+let mongoose = require('mongoose');
+let propertyDetailSchema = new mongoose.Schema({
+    key: String,
+    dispName: String,
+    value: String
+});
+
+let prj_property = new mongoose.Schema({
+    projectID: Number,
+    properties: Array  //原则上是应该设置好对象的属性，但在实际应用中发现mongoose保存的时候会自动增加objectId（_id）字段，无语。。。
+    // properties: [{
+    //     key: String,
+    //     dispName: String,
+    //     value: String
+    // }]
+}, {versionKey: false});
+
+//预储存的项目属性，在项目创建的时候copy一份到项目中
+let cfg_property = new mongoose.Schema({
+    rationLibID: Number,      //这个对应标准定额库ID
+    descr: String,      //描述
+    properties: [propertyDetailSchema]
+}, {versionKey: false});
+
+mongoose.model('project_property', prj_property, 'prj_properties');
+mongoose.model('cfg_prj_property', cfg_property, 'std_cfg_prj_properties');
+

modules/main/models/bills_sub_schemas.js

@@ -1,48 +0,0 @@
-/**
- * Created by jimiz on 2017/4/1.
- */
-var mongoose = require("mongoose");
-var Schema = mongoose.Schema;
-
-// 费用字段
-var feesSchema = new Schema({
-    fieldName: String,
-    unitFee: String, // Decimal. 单价
-    totalFee: String, // Decimal. 合价
-    tenderUnitFee: String, // Decimal. 调价后单价
-    tenderTotalFee: String // Decimal. 调价后合价
-});
-
-// 标记字段
-var flagsSchema = new Schema({
-    fieldName: String,
-    flag: Number
-});
-
-var changesSchema = new Schema({
-    addGLJ: String,
-    modifyGLJ:String,
-    deleteGLJ:String
-});
-
-//add by Zhong2017-8-30
-//清单工作内容字段
-let jobContentSchema = new Schema({
-    content: String, //工作内容
-    serialNo: Number, //排序用
-    isChecked: Boolean //是否勾选(输出)
-}, {_id: false});
-//特征值字段
-let eigenvalueSchema = new Schema({
-    value: String,
-    isSelected: Boolean //判断哪个特征值被选中
-}, {_id: false});
-//项目特征字段
-let itemCharacterSchema = new Schema({
-    character: String, //特征
-    serialNo: Number, //排序用
-    eigenvalue: [eigenvalueSchema],//特征值
-    isChecked: Boolean //是否勾选(输出)
-}, {_id: false});
-
-module.exports = {feesSchema: feesSchema, flagsSchema: flagsSchema, jobContentSchema: jobContentSchema, itemCharacterSchema: itemCharacterSchema};

modules/main/models/prj_properties.js

@@ -1,95 +0,0 @@
-/**
- * Created by jimiz on 2017/5/19.
- */
-// var mongoose = require("mongoose");
-// var db = require("../db/project_db");
-// var subSchema = require("./bills_sub_schemas");
-// var Schema = mongoose.Schema;
-// var deleteSchema = require('../../../public/models/delete_schema');
-// var consts = require('./project_consts');
-// var projectConsts = consts.projectConst;
-// var commonConsts = consts.commonConst;
-//
-// var projectPropertiesSchema = new Schema({
-//     ID: Number,
-//     unitPriceFileID: Number,
-//     unitPriceFileVer: Number,
-//     deleteInfo: deleteSchema
-// });
-//
-// var projectProperties = db.model("prj_properties", projectPropertiesSchema, "prj_properties");
-//
-// var projectPropertiesDAO = function(){};
-//
-// projectPropertiesDAO.prototype.getData = function(projectID, callback){
-//     projectProperties.find({'$or': [{ID: projectID, deleteInfo: null}, {ID: projectID, 'deleteInfo.deleted': {$in: [null, false]}}]}, '-_id', function(err, datas){
-//         if (!err) {
-//             callback(0, projectConsts.PROPERTIES, datas);
-//         } else {
-//             callback(1, '', null);
-//         };
-//     });
-// };
-//
-// projectPropertiesDAO.prototype.save = function(datas, callback){
-//     var functions = [];
-//     var data;
-//
-//     function saveOne(data) {
-//         return function (cb) {
-//             switch (data.updateType) {
-//                 case commonConsts.UT_UPDATE:
-//                     projectProperties.update({ID: data.ID}, data, cb);
-//                     break;
-//                 case commonConsts.UT_CREATE:
-//                     projectProperties.create(data, cb);
-//                     break;
-//                 case commonConsts.UT_DELETE:
-//                 /* 假删除
-//                  var item = new GLJ(doc);
-//                  item.remove(cb);
-//                  */
-//             }
-//         }
-//     }
-//     for (var i = 0; i < datas.length; i++){
-//         data = datas[i];
-//         functions.push(saveOne(data));
-//     }
-//
-//     async.parallel(functions, callback);
-// };
-//
-// module.exports = new projectPropertiesDAO();
-
-let mongoose = require('mongoose');
-let propertyDetailSchema = new mongoose.Schema({
-    key: String,
-    dispName: String,
-    value: String
-});
-
-let prj_property = new mongoose.Schema({
-    projectID: Number,
-    properties: Array  //原则上是应该设置好对象的属性，但在实际应用中发现mongoose保存的时候会自动增加objectId（_id）字段，无语。。。
-    // properties: [{
-    //     key: String,
-    //     dispName: String,
-    //     value: String
-    // }]
-}, {versionKey: false});
-
-//预储存的项目属性，在项目创建的时候copy一份到项目中
-let cfg_property = new mongoose.Schema({
-    rationLibID: Number,      //这个对应标准定额库ID
-    descr: String,      //描述
-    properties: [propertyDetailSchema]
-}, {versionKey: false});
-
-let prj_prop_mdl = mongoose.model('project_property', prj_property, 'prj_properties');
-let std_prj_prop_mdl = mongoose.model('cfg_prj_property', cfg_property, 'std_cfg_prj_properties');
-
-module.exports = {
-    prj_prop_mdl: prj_prop_mdl,
-    std_prj_prop_mdl: std_prj_prop_mdl
-};

modules/main/models/ration_programs.js

@@ -1,25 +0,0 @@
-/**
- * Created by jimiz on 2017/4/1.
- */
-var mongoose = require("mongoose");
-var db = require("../db/project_db");
-var Schema = mongoose.Schema;
-
-var rationProgramSchema = new Schema({
-    ID: Number,
-    projectID: Number,
-    name: String,
-    programs: [{
-        ID: Number,
-        serialNo: Number,
-        code: String,
-        name: String,
-        expression: String, // 表达式
-        displayExprs: String, // 显示用表达式/基数说明
-        feeRate: String, // Decimal
-        tenderFeeRate: String, // Decimal
-        feeRateID: Number, // 费率细目ID
-        mapField: String, // 对应定额表字段
-        comments: String // 备注
-    }]
-});

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();
-
-
-*/

modules/volume_price/models/volume_price_model.js

@@ -1,68 +0,0 @@
-/**
- * Created by Mai on 2017/7/25.
- */
-
-let consts = require('../../main/models/project_consts');
-let commonConsts = consts.commonConst;
-
-let mongoose = require('mongoose');
-let volumePrice = require("./volume_price_schema");
-let async = require("async");
-
-let baseModel = require('../../main/models/base_model');
-
-class volumePriceModel extends baseModel {
-    constructor (name) {
-        super(volumePrice);
-        this.collectionName = name;
-    };
-
-    getData (projectID, callback) {
-        volumePrice.find({'$or': [
-            {
-                projectID: projectID,
-                deleteInfo: null
-            }, {
-                projectID: projectID,
-                'deleteInfo.deleted': {$in: [null, false]}
-            }
-        ]},(err,datas)=>{
-            if(err){
-                callback(1, '', null);
-            }else {
-                // console.log(JSON.stringify(datas));
-                callback(0, consts.projectConst.VOLUMEPRICE, datas);
-            }
-        })
-    };
-
-    save (user_id, datas, callback) {
-        let funs = [];
-
-        function saveOne(doc) {
-            // console.log('-----------------------------------------------------------------------------' + JSON.stringify(doc));
-            return function (cb) {
-                switch (doc.updateType) {
-                    case commonConsts.UT_UPDATE:
-                        volumePrice.update({projectID: doc.updateData.projectID, ID: doc.updateData.ID}, doc.updateData, cb);
-                        break;
-                    case commonConsts.UT_CREATE:
-                        volumePrice.create(doc.updateData, cb);
-                        break;
-                    case commonConsts.UT_DELETE:
-                        doc.updateData.deleteInfo = {deleted: true, deleteDateTime: new Date(), deleteBy: user_id};
-                        volumePrice.update({projectID: doc.updateData.projectID, ID: doc.updateData.ID}, doc.updateData, cb);
-                        break;
-                }
-            }
-        }
-        for (let data of datas){
-            funs.push(saveOne(data));
-        }
-
-        async.parallel(funs, callback);
-    };
-
-};
-
-module.exports = new volumePriceModel(consts.projectConst.VOLUMEPRICE);

modules/volume_price/models/volume_price_schema.js

@@ -1,41 +0,0 @@
-/**
- * Created by Mai on 2017/7/25.
- * 量价
- */
-
-let mongoose = require("mongoose");
-let Schema = mongoose.Schema;
-let deleteSchema = require('../../../public/models/delete_schema');
-let subSchema = require('../../main/models/bills_sub_schemas');
-
-let collectionName = 'volume_price';
-let volumePriceSchema = new Schema({
-    // id
-    ID: Number,
-    // 关联pm
-    projectID: Number,
-    // 关联 Bills
-    billsItemID: Number,
-    // 排序
-    serialNo: Number,
-    // 编号
-    code: String,
-    // 量价类型：人工、材料、机械、主材、设备
-    type: String,
-    programID: Number,
-    // 名称
-    name: String,
-    // 单位
-    unit: String,
-    // 数量
-    quantity: Number,
-    marketUnitFee: String,
-    marketTotalFee: String,
-
-    // 费用字段
-    fees: [subSchema.feesSchema],
-    // 是否删除
-    deleteInfo: deleteSchema
-});
-
-module.exports = mongoose.model(collectionName, volumePriceSchema);

server.js

@@ -28,10 +28,6 @@ fileUtils.getGlobbedFiles('./modules/reports/models/*.js').forEach(function(mode
     require(path.resolve(modelPath));
 })
 
-// 引入人工系数模块
-require('./modules/main/models/labour_coe_model');
-require('./modules/main/models/calc_program_model');
-
 //config.setupCache();
 let cfgCacheUtil = require("./config/cacheCfg");
 cfgCacheUtil.setupDftCache();