diff --git a/app/api/controller/Article.php b/app/api/controller/Article.php index f04e8a1..cf40d2b 100644 --- a/app/api/controller/Article.php +++ b/app/api/controller/Article.php @@ -26,7 +26,7 @@ class Article extends BaseController $screen = $param['screen']??1; $solve = $param['solve']??1; $order = $param['order']??1; - $model = Db::table('fa_article'); +// $model = Db::table('fa_article'); $where = [ ['status', '=', 1], ['category_id', '=', $category_id] @@ -54,9 +54,9 @@ class Article extends BaseController } } //总条数 - $count = $model->where($where)->count(); + $count = Db::table('fa_article')->where($where)->count(); //当月条数 - $month_count = $model->where($where)->whereMonth('view_time')->count(); + $month_count = Db::table('fa_article')->where($where)->whereMonth('view_time')->count(); if ($search != '') { $where[] = ['title', 'like', '%' . $search . '%']; } @@ -92,7 +92,7 @@ class Article extends BaseController }else if($solve==3){ $where[] = ['is_solve', '=', 1]; } - $select = $model->with('user')->where($where)->page($page)->limit(20) + $select = Db::table('fa_article')->with('user')->where($where)->page($page)->limit(20) ->field('id,title,user_id,view,view_time,image,end_time,is_solve,is_vote,is_nickname,video,category_type,describe') ->order('id',$orders)->select()->toArray(); } @@ -294,7 +294,7 @@ class Article extends BaseController */ public function getArticleList($category_id = 0, $page = 1, $type = 1) { - $model = Db::table('fa_article'); +// $model = Db::table('fa_article'); $where = [ ['status', '=', 1], ]; @@ -536,8 +536,8 @@ class Article extends BaseController */ public function edit($id) { - $model =Db::table('fa_article'); - $find = $model->where('id', $id)->find(); +// $model =Db::table('fa_article'); + $find = Db::table('fa_article')->where('id', $id)->find(); if ($find && $find['is_vote'] == 1) { $data = Db::table('fa_article_vote_side_tables')->where('article_id', $find['id'])->find(); $find['extend']['vote'] = $data; @@ -581,7 +581,7 @@ class Article extends BaseController public function getWorkArticleCount() { - $model = Db::table('fa_article'); +// $model = Db::table('fa_article'); //根据个人村id进行查询 if (JWT_UID) { $find = Db::table('fa_szxc_information_useraddress')->where('user_id', JWT_UID)->find(); @@ -595,14 +595,17 @@ class Article extends BaseController } } } - $is_solve = $model->where('is_solve', 1)->where($where)->count(); - $shuqiu = $model->where('is_solve', 0)->where($where)->where('category_id', 'in',[165,150,149,148,147])->whereTime('end_time','>', date('Y-m-d h:i:s'))->count(); - $time = $model->where('is_solve', 0)->where($where)->where('category_id', 'in',[165,150,149,148,147])->whereTime('end_time','<=', date('Y-m-d h:i:s'))->count(); - $maodun = $model->where('is_solve', 0)->where($where)->where('category_id',147)->count(); - $xiejiao = $model->where('is_solve', 0)->where($where)->where('category_id', 148)->count(); - $saohei = $model->where('is_solve', 0)->where($where)->where('category_id', 149)->count(); - $sos = $model->where('is_solve', 0)->where($where)->where('category_id', 150)->count(); - $one_shuqiu = $model->where('is_solve', 0)->where($where)->where('category_id', 165)->count(); + + $ww['is_solve'] = 1; + $is_solve = Db::table('fa_article')->where($ww)->where($where)->count(); + $shuqiu = Db::table('fa_article')->where('is_solve', 0)->where($where)->where('category_id', 'in',[165,150,149,148,147])->whereTime('end_time','>', date('Y-m-d h:i:s'))->count(); + + $time = Db::table('fa_article')->where('is_solve', 0)->where($where)->where('category_id', 'in',[165,150,149,148,147])->whereTime('end_time','<=', date('Y-m-d h:i:s'))->count(); + $maodun = Db::table('fa_article')->where('is_solve', 0)->where($where)->where('category_id',147)->count(); + $xiejiao = Db::table('fa_article')->where('is_solve', 0)->where($where)->where('category_id', 148)->count(); + $saohei = Db::table('fa_article')->where('is_solve', 0)->where($where)->where('category_id', 149)->count(); + $sos = Db::table('fa_article')->where('is_solve', 0)->where($where)->where('category_id', 150)->count(); + $one_shuqiu = Db::table('fa_article')->where('is_solve', 0)->where($where)->where('category_id', 165)->count(); $select = [ 'solve_count' => $is_solve, 'shuqiu' => $shuqiu, @@ -620,8 +623,8 @@ class Article extends BaseController public function delete($id) { - $model = Db::table('fa_article'); - $res = $model->where('id', $id)->update(['status' => 0]); +// $model = Db::table('fa_article'); + $res = Db::table('fa_article')->where('id', $id)->update(['status' => 0]); if ($res) { return $this->apiSuccess('删除成功'); } else { @@ -632,7 +635,7 @@ class Article extends BaseController // 服务大厅小红点 public function getMyArticleCount() { - $model = Db::table('fa_article'); +// $model = Db::table('fa_article'); //根据个人id进行查询 $where[] = ['a.user_id','=',JWT_UID]; $where[] = ['b.is_read','=','0']; @@ -649,12 +652,12 @@ class Article extends BaseController } } } - $yishi = $model->alias('a')->join(['fa_article_vote_side_tables' => 'b'],'a.id=b.article_id')->where($www)->where('a.category_id',162)->whereTime('b.end_time', '>', date('Y-m-d H:i:s'))->count(); - $maodun = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id',147)->count(); - $xiejiao = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 148)->count(); - $saohei = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 149)->count(); - $sos = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 150)->count(); - $one_shuqiu = $model->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 165)->count(); + $yishi = Db::table('fa_article')->alias('a')->join(['fa_article_vote_side_tables' => 'b'],'a.id=b.article_id')->where($www)->where('a.category_id',162)->whereTime('b.end_time', '>', date('Y-m-d H:i:s'))->count(); + $maodun = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id',147)->count(); + $xiejiao = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 148)->count(); + $saohei = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 149)->count(); + $sos = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 150)->count(); + $one_shuqiu = Db::table('fa_article')->alias('a')->join(['article_comment' => 'b'],'a.id=b.vote_id')->where('a.is_solve', 1)->where($where)->where('a.category_id', 165)->count(); $select = [ 'yishi' => $yishi, 'maodun' => $maodun, @@ -672,7 +675,7 @@ class Article extends BaseController $screen = $param['screen']??1; $solve = $param['solve']??1; $order = $param['order']??1; - $model = Db::table('fa_article'); +// $model = Db::table('fa_article'); $where = [ ['status', '=', 1], ['category_id', '=', $category_id] @@ -693,9 +696,9 @@ class Article extends BaseController } //总条数 - $count = $model->where($where)->count(); + $count = Db::table('fa_article')->where($where)->count(); //当月条数 - $month_count = $model->where($where)->whereMonth('view_time')->count(); + $month_count = Db::table('fa_article')->where($where)->whereMonth('view_time')->count(); if ($search != '') { $where[] = ['title', 'like', '%' . $search . '%']; } @@ -731,7 +734,7 @@ class Article extends BaseController }else if($solve==3){ $where[] = ['is_solve', '=', 1]; } - $select = $model->with('user')->where($where)->page($page)->limit(20) + $select = Db::table('fa_article')->with('user')->where($where)->page($page)->limit(20) ->field('id,title,user_id,view,view_time,image,end_time,is_solve,is_vote,is_nickname,video,category_type,describe') ->order('id',$orders)->select()->toArray(); } diff --git a/app/api/controller/MyArticle.php b/app/api/controller/MyArticle.php index 93d615f..f53e5b9 100644 --- a/app/api/controller/MyArticle.php +++ b/app/api/controller/MyArticle.php @@ -22,7 +22,6 @@ class MyArticle extends BaseController public function index($search = '', $category_id = 1, $page = 1, $is_time=0,) { - $model = Db::table('fa_article'); $where = [ ['status', '=', 1], ['category_id', '=', $category_id], @@ -32,14 +31,14 @@ class MyArticle extends BaseController unset($where[1]); } //总条数 - $count = $model->where($where)->count(); + $count = Db::table('fa_article')->where($where)->count(); //当月条数 - $month_count = $model->where($where)->whereMonth('view_time')->count(); + $month_count = Db::table('fa_article')->where($where)->whereMonth('view_time')->count(); if ($search != '') { $where[] = ['title', 'like', '%' . $search . '%']; } //查询 - $select = $model->with('user')->where($where)->page($page)->limit(20) + $select = Db::table('fa_article')->with('user')->where($where)->page($page)->limit(20) ->field('id,title,user_id,view,view_time,image,end_time,is_solve,is_vote,is_nickname,describe')->order('id DESC')->select()->toArray(); foreach ($select as $key => $value) { if ($value['is_nickname'] == 1) {