1 个管道
的构建
通过
耗费
1 秒
Merge branch 'master' of http://114.215.101.231:8099/guosheng/community into Branch_liuzhen
正在显示
2 个修改的文件
包含
34 行增加
和
16 行删除
@@ -245,11 +245,13 @@ class HouseAdmin extends Api | @@ -245,11 +245,13 @@ class HouseAdmin extends Api | ||
245 | $pageNum = $this->request->param('pageNum', 10, 'intval'); | 245 | $pageNum = $this->request->param('pageNum', 10, 'intval'); |
246 | $house_id = $this->request->param('house_id'); | 246 | $house_id = $this->request->param('house_id'); |
247 | empty($house_id) && $this->error('社区id不能为空'); | 247 | empty($house_id) && $this->error('社区id不能为空'); |
248 | - $data['total_num'] = Db::name('house_board') | ||
249 | - ->where('house_id',$house_id) | 248 | + $where = ['hb.house_id'=>$house_id]; |
249 | + $total_num = HouseBoard::where($where) | ||
250 | + ->alias('hb') | ||
251 | + ->join('house_admin ha','ha.id = hb.admin_user_id') | ||
250 | ->count(); | 252 | ->count(); |
251 | - $data['info'] = $this->getBoardList(['hb.house_id'=>$house_id],$page,$pageNum); | ||
252 | - $this->success('success',$data); | 253 | + $list = $this->getBoardList($where,$page,$pageNum); |
254 | + $this->success('success',compact('total_num','list')); | ||
253 | } | 255 | } |
254 | 256 | ||
255 | /** | 257 | /** |
@@ -558,6 +560,10 @@ class HouseAdmin extends Api | @@ -558,6 +560,10 @@ class HouseAdmin extends Api | ||
558 | if(!empty($keyword)){ | 560 | if(!empty($keyword)){ |
559 | $where['uh.name|uh.remark'] = ['like','%'.$keyword.'%']; | 561 | $where['uh.name|uh.remark'] = ['like','%'.$keyword.'%']; |
560 | } | 562 | } |
563 | + $total_num = UserHouse::alias('uh') | ||
564 | + ->join('user u','u.id = uh.user_id') | ||
565 | + ->where($where) | ||
566 | + ->count(); | ||
561 | $list = UserHouse::alias('uh') | 567 | $list = UserHouse::alias('uh') |
562 | ->join('user u','u.id = uh.user_id') | 568 | ->join('user u','u.id = uh.user_id') |
563 | ->where($where) | 569 | ->where($where) |
@@ -568,7 +574,7 @@ class HouseAdmin extends Api | @@ -568,7 +574,7 @@ class HouseAdmin extends Api | ||
568 | foreach($list as &$v){ | 574 | foreach($list as &$v){ |
569 | $v['avatar'] = cdnurl($v['avatar']); | 575 | $v['avatar'] = cdnurl($v['avatar']); |
570 | } | 576 | } |
571 | - $this->success('success',['total_num'=>count($list),'list'=>$list]); | 577 | + $this->success('success',compact('total_num','list')); |
572 | } | 578 | } |
573 | 579 | ||
574 | /** | 580 | /** |
@@ -649,8 +655,12 @@ class HouseAdmin extends Api | @@ -649,8 +655,12 @@ class HouseAdmin extends Api | ||
649 | $pageNum = $this->request->param('pageNum', 10, 'intval'); | 655 | $pageNum = $this->request->param('pageNum', 10, 'intval'); |
650 | $house_id = $this->request->param('house_id'); | 656 | $house_id = $this->request->param('house_id'); |
651 | empty($house_id) && $this->error('缺少必要参数'); | 657 | empty($house_id) && $this->error('缺少必要参数'); |
658 | + $where = ['object_user_id'=>$this->auth->id]; | ||
659 | + $total_num = Message::where('object_id',$house_id) | ||
660 | + ->where($where) | ||
661 | + ->count(); | ||
652 | $list = Message::where('object_id',$house_id) | 662 | $list = Message::where('object_id',$house_id) |
653 | - ->where('object_user_id',$this->auth->id) | 663 | + ->where($where) |
654 | ->page($page,$pageNum) | 664 | ->page($page,$pageNum) |
655 | ->order('createtime desc') | 665 | ->order('createtime desc') |
656 | ->select(); | 666 | ->select(); |
@@ -663,7 +673,7 @@ class HouseAdmin extends Api | @@ -663,7 +673,7 @@ class HouseAdmin extends Api | ||
663 | $v['name'] = Db::name('user')->where('id',$v['user_id'])->value('nickname'); | 673 | $v['name'] = Db::name('user')->where('id',$v['user_id'])->value('nickname'); |
664 | } | 674 | } |
665 | } | 675 | } |
666 | - $this->success('success',['total_num'=>count($list),'list'=>$list]); | 676 | + $this->success('success',compact('total_num','list')); |
667 | } | 677 | } |
668 | 678 | ||
669 | /** | 679 | /** |
@@ -712,12 +722,13 @@ class HouseAdmin extends Api | @@ -712,12 +722,13 @@ class HouseAdmin extends Api | ||
712 | 722 | ||
713 | $msg->is_read_object = 1; | 723 | $msg->is_read_object = 1; |
714 | $msg->save(); | 724 | $msg->save(); |
715 | - | ||
716 | - $list = HouseComment::where([ | ||
717 | - 'user_id' => $msg['user_id'], | ||
718 | - 'house_id' => $msg['object_id'], | ||
719 | - 'house_user_id' => $msg['object_user_id'], | ||
720 | - ])->order(['createtime'=>'desc']) | 725 | + $where = [ |
726 | + 'user_id' => $msg['user_id'], | ||
727 | + 'house_id' => $msg['object_id'], | ||
728 | + 'house_user_id' => $msg['object_user_id'], | ||
729 | + ]; | ||
730 | + $total_num = HouseComment::where($where)->count(); | ||
731 | + $list = HouseComment::where($where)->order(['createtime'=>'desc']) | ||
721 | ->page($page,$pageNum) | 732 | ->page($page,$pageNum) |
722 | ->select(); | 733 | ->select(); |
723 | array_multisort(array_column($list,'createtime'),SORT_ASC,$list); | 734 | array_multisort(array_column($list,'createtime'),SORT_ASC,$list); |
@@ -733,7 +744,7 @@ class HouseAdmin extends Api | @@ -733,7 +744,7 @@ class HouseAdmin extends Api | ||
733 | } | 744 | } |
734 | $v['user'] = $user; | 745 | $v['user'] = $user; |
735 | } | 746 | } |
736 | - $this->success('success',['total_num'=>count($list),'list'=>$list]); | 747 | + $this->success('success',compact('total_num','list')); |
737 | } | 748 | } |
738 | 749 | ||
739 | /** | 750 | /** |
@@ -691,6 +691,8 @@ class User extends Api | @@ -691,6 +691,8 @@ class User extends Api | ||
691 | * @ApiRoute (/api/user/moneyLog) | 691 | * @ApiRoute (/api/user/moneyLog) |
692 | * | 692 | * |
693 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") | 693 | * @ApiHeaders (name=token, type=string, required=true, description="请求的Token") |
694 | + * @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)") | ||
695 | + * @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数(默认10)") | ||
694 | * | 696 | * |
695 | * @ApiReturn({ | 697 | * @ApiReturn({ |
696 | "code": 1, | 698 | "code": 1, |
@@ -705,10 +707,15 @@ class User extends Api | @@ -705,10 +707,15 @@ class User extends Api | ||
705 | */ | 707 | */ |
706 | public function moneyLog() | 708 | public function moneyLog() |
707 | { | 709 | { |
708 | - $list = UserMoneyLog::where('user_id',$this->auth->id) | 710 | + $page = $this->request->param('page', 1, 'intval'); |
711 | + $pageNum = $this->request->param('pageNum', 10, 'intval'); | ||
712 | + $where = ['user_id'=>$this->auth->id]; | ||
713 | + $total_num = UserMoneyLog::where($where)->count(); | ||
714 | + $list = UserMoneyLog::where($where) | ||
709 | ->field("memo,money,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime") | 715 | ->field("memo,money,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime") |
716 | + ->page($page,$pageNum) | ||
710 | ->select(); | 717 | ->select(); |
711 | - $this->success('成功',$list); | 718 | + $this->success('成功',compact('total_num','list')); |
712 | } | 719 | } |
713 | 720 | ||
714 | /** | 721 | /** |
-
请 注册 或 登录 后发表评论