|
@@ -4,6 +4,7 @@
|
|
|
var mongoose = require("mongoose");
|
|
|
var db = require("../db/project_db");
|
|
|
var subSchema = require("./billsSubSchemas");
|
|
|
+var deleteSchema = require('../../../public/models/deleteSchema');
|
|
|
var Schema = mongoose.Schema;
|
|
|
var counter = require("../../../public/counter/counter.js");
|
|
|
|
|
@@ -37,7 +38,8 @@ var billsSchema = new Schema({
|
|
|
// 费用字段
|
|
|
fees: [subSchema.feesSchema],
|
|
|
// 标记字段
|
|
|
- flags: [subSchema.flagsSchema]
|
|
|
+ flags: [subSchema.flagsSchema],
|
|
|
+ deleteInfo: deleteSchema
|
|
|
});
|
|
|
|
|
|
var bills = db.model("bills", billsSchema);
|
|
@@ -45,7 +47,7 @@ var bills = db.model("bills", billsSchema);
|
|
|
var billsDAO = function(){};
|
|
|
|
|
|
billsDAO.prototype.getData = function(projectID, callback){
|
|
|
- bills.find({projectID: projectID}, function(err, datas){
|
|
|
+ bills.find({'$or': [{projectID: projectID, deleteInfo: null}, {projectID: projectID, 'deleteInfo.deleted': {$in: [null, false]}}]}, '-_id', function(err, datas){
|
|
|
if (!err) {
|
|
|
callback(0, '', datas);
|
|
|
} else {
|