Commit 13cf76cf authored by 刘文胜's avatar 刘文胜

公告 板块 标签 自定义排序

parent 45f78b27
......@@ -224,6 +224,16 @@ router.get('/infos/list', function(req, res, next) {
});
});
//板块上移
router.put('/infos/moveUP/:id', function(req, res, next) {
var id=req.params.id;
forumInfoService.updateInfoIdx(id,function(err,result){
if(err || !result){
return res.json(returnCode.BUSY);
}
return res.json(_.assign({data:true}, returnCode.SUCCESS));
});
});
//子板块报表
router.post('/info/report/:id', function(req, res, next) {
......
......@@ -72,6 +72,22 @@ function update(obj,callback){
});
}
//上移
router.put('/notice/moveUP/:id', function(req, res, next) {
var id=req.params.id;
Notice.update(
{_id:id},
{$inc: { order_idx: 1 }},
{w:1,safe:true},
function(err,result){
if(err){
return res.json({err:err});
}else{
res.json({result:true});
}
});
});
router.post('/notice', function(req, res, next) {
req.body.ent_code = req.session.user.ent_code;
var notice = new Notice(req.body);
......@@ -112,7 +128,7 @@ router.post('/notice/search', function(req, res, next) {
//如果sort为空
if(!sort)
{
_sort = {top:-1,createtime:-1};
_sort = {top:-1,order_idx:-1,createtime:-1};
}
if(sort){
_sort[sort] = -1;//降序
......
......@@ -95,6 +95,22 @@ router.get('/tag/:tid/get', function(req, res, next) {
}
});
//上移
router.put('/tag/moveUP/:id', function(req, res, next) {
var id=req.params.id;
ForumTag.update(
{_id:id},
{$inc: { order_idx: 1 }},
{w:1,safe:true},
function(err,result){
if(err){
return res.json({err:err});
}else{
res.json({result:true});
}
});
});
//查询所有标签
router.get('/tag/list', function(req, res, next) {
var pageNo = req.query.pageNo || 1,
......
......@@ -94,7 +94,7 @@ router.get('/notice/newestMsg', function(req, res, next) {
pageSize=req.query.pageSize,
plate=req.query.plate;
var _condition = {status:1,type:2,ent_code:req.session.user.ent_code},_sort = {top:-1,createtime:-1};
var _condition = {status:1,type:2,ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1,createtime:-1};
if(plate){
_condition.$or=[{plate:plate},{plate:null}];
}else{
......@@ -128,7 +128,7 @@ router.get('/notice/newestAct', function(req, res, next) {
ent_code:req.session.user.ent_code,
startdate:{$lte:curdate},
indate:{$gte:curdate},
},_sort = {top:-1,createtime:-1};
},_sort = {top:-1,order_idx:-1,createtime:-1};
if(plate){
_condition.$or=[{plate:plate},{plate:null}];
}else{
......@@ -157,7 +157,7 @@ router.get('/notice/oldAct', function(req, res, next) {
plate=req.query.plate,
curdate = new Date(),
_condition = {status:1,type:1,ent_code:req.session.user.ent_code,$or:[{indate:{$lt:curdate}},{finished:1}]},
_sort = {top:-1,createtime:-1};
_sort = {top:-1,order_idx:-1,createtime:-1};
if(plate){
_condition.$or=[{plate:plate},{plate:null}];
}else{
......
......@@ -62,6 +62,11 @@ var ForumNoticeSchema = new Schema({
default: 0,
index: true
},
order_idx: { //排序
type: Number,
require: true,
default: 0
},
status: { //是否显示 0/1 隐藏/显示
type: Number,
require: true,
......
......@@ -72,7 +72,7 @@ exports.getAllByGid= function(conditions,pageNo,pageSize,callback) {
}else{
var skip = (pageNo - 1) * pageSize;
var limit = count - skip > pageSize ? pageSize : (count - skip);
ForumInfo.find(conditions).populate('group').skip(skip).limit(limit).sort('created').exec(function(err, docs) {
ForumInfo.find(conditions).populate('group').skip(skip).limit(limit).sort({order_idx:-1}).exec(function(err, docs) {
if (err) {
console.error(err);
callback(err,null);
......@@ -105,6 +105,21 @@ exports.updateInfoPvCount=function(fid,callback){
});
};
//上移
exports.updateInfoIdx=function(fid,callback){
ForumInfo.update(
{_id:fid},
{$inc: { order_idx: 1 }},
{w:1,safe:true},
function(err,result){
if(err){
console.error(err);
callback(err,null);
}else{
callback(null,true);
}
});
};
//获取板块
//获取全部列表数据
......
......@@ -72,7 +72,7 @@ exports.getAllTag= function(conditions,pageNo,pageSize,callback) {
}else{
var skip = (pageNo - 1) * pageSize;
var limit = count - skip > pageSize ? pageSize : (count - skip);
ForumTag.find(conditions, null, {skip: skip,limit:limit,sort:'created',populate:'info'},function(err,docs){
ForumTag.find(conditions, null, {skip: skip,limit:limit,sort:{order_idx:-1},populate:'info'},function(err,docs){
if (err) {
console.error(err);
callback(err,null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment