|
|
@@ -14,6 +14,9 @@ class Message extends Controller
|
|
|
$time = input("param.time/s");
|
|
|
$key = input("param.key/s");
|
|
|
$type = input("param.type/s");
|
|
|
+ $limit = input("param.pageSize/s");
|
|
|
+ $pageNumber = input("param.pageNumber/s");
|
|
|
+ $offset = (input("param.pageNumber/s") - 1) * $limit;
|
|
|
if($time == 'week'){
|
|
|
//前一周
|
|
|
$start = time()-604800;
|
|
|
@@ -42,12 +45,15 @@ class Message extends Controller
|
|
|
}
|
|
|
}
|
|
|
if(!empty($key)){
|
|
|
- $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->where($where)->whereLike('content','%'.$key.'%')->where('if_public', 1)->select();
|
|
|
+ $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->where($where)->whereLike('content','%'.$key.'%')->where('if_public', 1)->limit($offset, $limit)->order('add_time', 'desc')->select();
|
|
|
+ $total = db('accountsmessage')->whereBetween('add_time', [$start, $end])->where($where)->whereLike('content','%'.$key.'%')->where('if_public', 1)->limit($offset, $limit)->order('add_time', 'desc')->count();
|
|
|
}else{
|
|
|
- $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->where($where)->where('if_public', 1)->select();
|
|
|
+ $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->where($where)->where('if_public', 1)->limit($offset, $limit)->order('add_time', 'desc')->select();
|
|
|
+ $total = db('accountsmessage')->whereBetween('add_time', [$start, $end])->where($where)->where('if_public', 1)->limit($offset, $limit)->order('add_time', 'desc')->count();
|
|
|
}
|
|
|
|
|
|
$type = db('messagetype')->select();
|
|
|
+ $users = db('users')->select();
|
|
|
foreach($message as $key=>$vo){
|
|
|
//转为日期时间格式
|
|
|
$message[$key]['add_time'] = date('Y-m-d H:i:s',$vo['add_time']);
|
|
|
@@ -58,12 +64,25 @@ class Message extends Controller
|
|
|
$message[$key]['type_name'] = $type[$i]['name'];
|
|
|
}
|
|
|
}
|
|
|
+ foreach($users as $k=>$v){
|
|
|
+ if($vo['user_id'] == $v['id']){
|
|
|
+ $message[$key]['user_name'] = $users[$k]['user_name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+ //总页数
|
|
|
+ $pages = ceil($total/$limit);
|
|
|
+ $list = array();
|
|
|
+ $list['total'] = $total;
|
|
|
+ $list['pages'] = $pages;
|
|
|
+ $list['pageSize'] = $limit;
|
|
|
+ $list['pageNumber'] = $pageNumber;
|
|
|
+ $list['list'] = $message;
|
|
|
|
|
|
$data = [
|
|
|
'status'=>1,
|
|
|
'msg'=>'成功',
|
|
|
- 'data'=>$message
|
|
|
+ 'data'=>$list
|
|
|
];
|
|
|
|
|
|
return json_encode($data,JSON_UNESCAPED_UNICODE);
|