Merge commit 'b4b4f579' into SANDBOX

# Conflicts:
#	app/controllers/admin/forumThread.js
#	app/models/forumThread.js

app/controllers/admin/forumThread.js

@@ -394,6 +394,7 @@ router.get('/threads/list', function(req, res, next) {
     var mid = req.query.mid;
     var quality = req.query.quality;
     var new_recommend = req.query.new_recommend;
+    var eventStatus = req.query.eventStatus;
 
     var conditions = {
         ent_code: req.session.user.ent_code,
@@ -410,12 +411,10 @@ router.get('/threads/list', function(req, res, next) {
             $in: [tagId]
         };
     }
-
     if (pid) {
         conditions.pid = pid;
         conditions.level = 2;
     }
-
     if (content) {
         conditions.content = {
             $regex: content,
@@ -423,11 +422,10 @@ router.get('/threads/list', function(req, res, next) {
         }
     }
     if (type) {
-        conditions.type = type;
+        conditions.type = Number(type);
     }
-
     if (status) {
-        conditions.status = status;
+        conditions.status = Number(status);
     }
     if (quality) {
         conditions.quality = quality;
@@ -437,6 +435,18 @@ router.get('/threads/list', function(req, res, next) {
         conditions.new_recommend = new_recommend;
     }
 
+    if (eventStatus) {
+        var today = new Date();
+        conditions.isEvent = 1;
+        if(eventStatus == 0){
+            conditions['event.eventStartTime'] = {$gt : today};
+        }else if(eventStatus == 1){
+            conditions['event.eventStartTime'] = {$lte : today},
+            conditions['event.eventEndTime'] = {$gte : today}
+        }else if(eventStatus == 2){
+            conditions['event.eventEndTime'] = {$gt : today};
+        }
+    }
     if (mid) {
         forumThreadService.getAllThreadByFidAndMid(mid, conditions, pageNo, pageSize, null, function(err, results) {
             if (err) {

app/controllers/mobile/forumInfo.js

@@ -156,10 +156,20 @@ router.get('/info/:fid/threads', function(req, res, next) {
     var fid = req.params.fid;
     var sort = '-top -topTime -quality -created';
     var ent_code = req.session.user.ent_code;
+    var today = new Date();
     var conditions = {
         ent_code: ent_code,
         level: 1,
-        status: 1
+        status: 1,
+        $or: [{
+            isEvent: 0
+        }, {
+            isEvent: null
+        }, {
+            isEvent: 1,
+            'event.eventStartTime' : {$lte : today},
+            'event.eventEndTime' : {$gte : today}
+        }]
     };
     if (fid) {
         conditions.info = fid;
@@ -227,15 +237,24 @@ router.get('/info/:fid/hotThreads', function(req, res, next) {
     var fid = req.params.fid || null;
     var pageNo = req.query.pageNo || 1;
     var pageSize = req.query.pageSize || 10;
-
+    var today = new Date();
     var conditions = {
         ent_code: req.session.user.ent_code,
         level: 1,
         info: fid,
         status: {
             $ne: 3
-        }
-    };
+        },
+        $or: [{
+            isEvent: 0
+        }, {
+            isEvent: null
+        }, {
+            isEvent: 1,
+            'event.eventStartTime' : {$lte : today},
+            'event.eventEndTime' : {$gte : today}
+        }]
+    }
 
     if (fid) {
 
@@ -283,7 +302,7 @@ router.get('/info/:fid/photoThreads', function(req, res, next) {
     var fid = req.params.fid || null;
     var pageNo = req.query.pageNo || 1;
     var pageSize = req.query.pageSize || 10;
-
+    var today = new Date();
     var conditions = {
         ent_code: req.session.user.ent_code,
         level: 1,
@@ -291,7 +310,16 @@ router.get('/info/:fid/photoThreads', function(req, res, next) {
         type: 3,
         status: {
             $ne: 3
-        }
+        },
+        $or: [{
+            isEvent: 0
+        }, {
+            isEvent: null
+        }, {
+            isEvent: 1,
+            'event.eventStartTime' : {$lte : today},
+            'event.eventEndTime' : {$gte : today}
+        }]
     };
 
     if (fid) {
@@ -575,10 +603,20 @@ router.get('/info/:fid/serachThreads', function(req, res, next) {
     var pageSize = req.query.pageSize || 10;
     var content = req.query.content;
     var ent_code = req.session.user.ent_code;
+    var today = new Date();
     var conditions = {
         ent_code: ent_code,
         status: 1,
-        info: fid
+        info: fid,
+        $or: [{
+            isEvent: 0
+        }, {
+            isEvent: null
+        }, {
+            isEvent: 1,
+            'event.eventStartTime' : {$lte : today},
+            'event.eventEndTime' : {$gte : today}
+        }]
     };
 
     if (content) {

app/controllers/mobile/forumThread.js

@@ -405,12 +405,21 @@ router.get('/thread/searchThread', function(req, res, next) {
         status = 1,
         ent_code = req.session.user.ent_code;
 
-
+    var today = new Date();
     if (pageNo && pageSize) {
         var q = {
             ent_code: ent_code,
             status: status,
-            from: from
+            from: from,
+            $or: [{
+                isEvent: 0
+            }, {
+                isEvent: null
+            }, {
+                isEvent: 1,
+                'event.eventStartTime' : {$lte : today},
+                'event.eventEndTime' : {$gte : today}
+            }]
         };
 
         forumThreadService.findThreadByPage(pageNo, pageSize, q, function(err, result) {

app/models/forumThread.js

@@ -130,6 +130,21 @@ var ForumThreadSchema = new Schema({
 	new_recommend_time:{//推荐时间
 		type: Date
 	},
+	isEvent:{//是否活动 0否 1是 
+		type: Number,
+		require: true,
+		default: 0
+	}, 
+	event: { //活动
+		eventStartTime:{
+			type: Date,
+		    required: true
+		},
+		eventEndTime:{
+			type: Date,
+		    required: true
+		}
+	},
 	created: {
 	    type: Date,
 	    required: true,