1

application/api/controller/Ucenter.php

@@ -24,6 +24,7 @@ class Ucenter extends Controller{
     protected $apply_yboard_obj = '';
     protected $user_score_log_obj = '';
     protected $user_index_log_obj = '';
+    protected $user_to_yboard_obj = '';
 
     public function __construct(\think\Request $request = null)
     {
@@ -43,6 +44,7 @@ class Ucenter extends Controller{
         $this->apply_yboard_obj = Db::name('apply_yboard');
         $this->user_score_log_obj = Db::name('user_score_log');
         $this->user_index_log_obj = Db::name('user_index_log');
+        $this->user_to_yboard_obj = Db::name('user_to_yboard');
     }
 
 
@@ -66,7 +68,6 @@ class Ucenter extends Controller{
 
         // 基本信息
         $baseInfo = $this->user_obj->where(['user_id' => $data['user_id']])->find();
-        // $userInfo['baseInfo'] = $baseInfo;
 
         //检查用户reviewer的info信息
         $reviewer_info = $this->user_reviewer_info_obj->where('reviewer_id',$data['user_id'])->find();
@@ -74,9 +75,8 @@ class Ucenter extends Controller{
             $insert_reviewer['reviewer_id'] = $data['user_id'];
             $this->user_reviewer_info_obj->insert($insert_reviewer);
         }
-
+        
         $userInfo['baseInfo']=$this->user_obj
-            // ->field("t_user.*,")
             ->join('t_user_reviewer_info','t_user.user_id = t_user_reviewer_info.reviewer_id','left')
             ->where('t_user.user_id',$data['user_id'])
             ->find();
@@ -89,17 +89,26 @@ class Ucenter extends Controller{
         if($isAuthor){
             $userInfo['asAuthor'] = self::getAsAuthor($baseInfo['user_id']);
         }
+
+        
         //审稿人
         $isReviewer = $this->reviewer_to_journal_obj->where(['reviewer_id'=>$baseInfo['user_id'],'state'=>0])->find();
         if($isReviewer){
             $userInfo['asReviewer'] = self::getAsReviewer($baseInfo['user_id']);
         }
+
         //编委信息
         $isBoard = $this->board_to_journal_obj->where('user_id',$baseInfo['user_id'])->where('state',0)->select();
         if($isBoard){
             $userInfo['asBoard'] = self::getAsBoard($baseInfo['user_id']);
         }
 
+        //青年科学家
+        $isYboard = $this->user_to_yboard_obj->where('user_id',$data['user_id'])->where('state',0)->select();
+        if($isYboard){
+            $userInfo['Yboard'] = self::getAsYboard($baseInfo['user_id']);
+        }
+
         return jsonSuccess($userInfo);
     }
 
@@ -126,7 +135,8 @@ class Ucenter extends Controller{
         if(!$rule->check($data)){
             return jsonError($rule->getError());
         }
-        $ids = $this->reviewer_to_journal_obj->where('reviewer_id',$data['user_id'])->where('state',0)->where('is_yboard',0)->column('journal_id');
+        // $ids = $this->reviewer_to_journal_obj->where('reviewer_id',$data['user_id'])->where('state',0)->where('is_yboard',0)->column('journal_id');
+        $ids = $this->user_to_yboard_obj->where('user_id',$data['user_id'])->where('start_date','<=',time())->where('end_date',">=",time())->where('state',0)->column("journal_id");
         $journals = $this->journal_obj->where('journal_id','in',$ids)->where('state',0)->select();
         $re['journals'] = $journals;
         return jsonSuccess($re);
@@ -152,6 +162,19 @@ class Ucenter extends Controller{
         return jsonSuccess([]);
     }
 
+    public function getAsYboard($user_id){
+        $user_info = $this->user_obj->where('user_id',$user_id)->find();
+        $list = $this->user_to_yboard_obj->where('user_id',$user_id)->where('state',0)->group('journal_id')->select();
+        $frag = [];
+        foreach($list as $v){
+            $journal = $this->journal_obj->where('journal_id',$v['journal_id'])->find();
+            $cl = $this->user_to_yboard_obj->where('user_id',$user_id)->where('journal_id',$v['journal_id'])->select();
+            $journal['sd'] = $cl;
+            $frag[] = $journal;
+        }
+        return $frag;
+    }
+
     public function applyBoard(){
         $data = $this->request->post();
         $rule = new Validate([
@@ -408,6 +431,9 @@ class Ucenter extends Controller{
     }
 
     private function getMajorShu($major){
+        if($major==0){
+            return ;
+        }
         $res = $this->major_obj->where('major_id',$major)->find();
         if($res['pid']==1){
             return $res['major_id'];