From 00cf775c79ef13a06581dc25828cac4e09ddd89b Mon Sep 17 00:00:00 2001 From: chengxl Date: Thu, 28 Aug 2025 14:01:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Finalreview.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/application/api/controller/Finalreview.php b/application/api/controller/Finalreview.php index af8f826..b2804fe 100644 --- a/application/api/controller/Finalreview.php +++ b/application/api/controller/Finalreview.php @@ -520,7 +520,7 @@ class Finalreview extends Base $aWhere = ['art_rev_id' => ['in',$aArtRevId],'state' => 0]; //查询初审问卷 - $aQuestion = Db::name('article_reviewer_question')->field('art_rev_id,score,comments,ctime,is_anonymous')->where($aWhere)->order('ctime asc')->select(); + $aQuestion = Db::name('article_reviewer_question')->where($aWhere)->order('ctime asc')->select(); $aQuestion = empty($aQuestion) ? [] : array_column($aQuestion, null,'art_rev_id'); //查询复审 @@ -544,12 +544,8 @@ class Finalreview extends Base $value['realname'] = empty($aUser[$value['reviewer_id']]) ? '' : $aUser[$value['reviewer_id']]; $value['ctime'] = empty($aQuestionInfo['ctime']) ? date('Y-m-d H:i:s',$value['ctime']) : date('Y-m-d H:i:s',$aQuestionInfo['ctime']); $value['is_anonymous'] = empty($aQuestionInfo['is_anonymous']) ? 0 : $aQuestionInfo['is_anonymous']; - if(!empty($aQuestionInfo['ctime'])){ - unset($aQuestionInfo['ctime']); - unset($aQuestionInfo['is_anonymous']); - } - $aReviewerData[] = array_merge($value,$aQuestionInfo); - //时间处理 + $value['question'] = $aQuestionInfo; + $aReviewerData[] = $value; //复审 $aReviewerRepeatInfo = empty($aReviewerRepeat[$value['art_rev_id']]) ? [] : $aReviewerRepeat[$value['art_rev_id']]; @@ -600,7 +596,7 @@ class Finalreview extends Base } } } - return json_encode(['status' => 1,'msg' => 'success','data' => ['article_review' => $aReviewerData,'article_review_repeat' => empty($aReviewerRepeat) ? [] : $aReviewerRepeat,'article_response' => empty($aResponse) ? [] : $aResponse,'article_final' => empty($aFinal) ? [] : $aFinal,'article' => $aArticle]]); + return json_encode(['status' => 1,'msg' => 'success','data' => ['article_review' => $aReviewerData,'article_review_repeat' => empty($aReviewerRepeatData) ? [] : $aReviewerRepeatData,'article_response' => empty($aResponse) ? [] : $aResponse,'article_final' => empty($aFinal) ? [] : $aFinal,'article' => $aArticle]]); } /** * @title 获取终审文章列表