Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

modules/all_models/divide_setting.js

@@ -0,0 +1,13 @@
+let mongoose = require('mongoose');
+let Schema = mongoose.Schema;
+
+let divideSchema = {
+  ID:{type:String,index: true},
+  projectID:Number,
+  divideList:[Schema.Types.Mixed],
+  ration_gljs:[Schema.Types.Mixed],
+  ration_coes:[Schema.Types.Mixed],
+  divideType:Number//分摊方式（3种）
+}
+
+mongoose.model("divide_setting", new Schema(divideSchema, {versionKey: false, collection: "divide_setting"}));

modules/sys_tools/models/sys_model.js

@@ -32,6 +32,7 @@ let comElectrovalenceModel = mongoose.model("com_electrovalence");
 const feeRateFileModel = mongoose.model('fee_rate_file');
 const feeRateModel = mongoose.model('fee_rates');
 const compleRationSection = mongoose.model('complementary_ration_section_tree');
+let divideModel = mongoose.model("divide_setting");
 
 //删除垃圾数据
 async function clearJunkData(callback){
@@ -91,6 +92,10 @@ async function clearJunkData(callback){
         functions.push(function(cb){
             quantityDetailModel.remove({projectID: {$in: junkProjIds}}, cb);
         });
+        //清除分摊数据
+        functions.push(function(cb){
+          divideModel.remove({projectID: {$in: junkProjIds}}, cb);
+      });
     }
     //彻底删除了的单价文件
     let junkUFs = await unitPriceFileModel.find({'deleteInfo.deleted': true, 'deleteInfo.completeDeleted': true});