From 0d676ccd433960113e89dc3db551f08cb5682d1e Mon Sep 17 00:00:00 2001
From: chengxl <chengxl@example.com>
Date: Tue, 14 Oct 2025 18:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E5=AF=B9=E7=8A=B6=E6=80=81=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Proofread.php | 27 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/application/api/controller/Proofread.php b/application/api/controller/Proofread.php
index 75803d9..b419599 100644
--- a/application/api/controller/Proofread.php
+++ b/application/api/controller/Proofread.php
@@ -502,6 +502,7 @@ class Proofread extends Base
         return json_encode(['status' => 1,'msg' => "Update successful"]); 
     }
 
+    
     /**
      * @title 根据状态统计数量
      * @param article_id 文章ID
@@ -531,16 +532,26 @@ class Proofread extends Base
         }
         
         //查询校对内容
-        $iState = empty($aParam['state']) ? 2 : explode(',', $aParam['state']);
-        if(!empty($iState)){
-            $aWhere['state'] = ['in',$iState];
-        }
+        $aState = empty($aParam['state']) ? [1,2] : explode(',', $aParam['state']);
+        $aWhere['state'] = ['in',$aState];
         $aWhere['is_delete'] = 2;
-        $aCount = Db::name('article_proofread')->field('am_id,count(id) as num')->where($aWhere)->group('am_id')->select(); 
-        $aCount = empty($aCount) ? [] : array_column($aCount, 'num','am_id');
+        $aCount = Db::name('article_proofread')->field('am_id,count(id) as num,state')->where($aWhere)->group('am_id,state')->order('am_id')->select();
+        $aCountData = []; 
+        $iCount = -1;
+        if(!empty($aCount)){
+            $iCount = 0;
+            foreach ($aCount as $key => $value) {
+                $aCountData[$value['am_id']][$value['state']] = $value['num'];
+                if($value['state'] == 2){
+                    $iCount += $value['num'];
+                }
+            }
+        }
         //总数量
-        $iCount = empty($aCount) ? 0 : array_sum(array_values($aCount));
-        $am_id_count = empty($aCount[$iAmId]) ? 0 : $aCount[$iAmId];
+        $am_id_count = -1;
+        if(!empty($aCountData[$iAmId])){
+            $am_id_count = empty($aCountData[$iAmId][2]) ? 0 : $aCountData[$iAmId][2];
+        }
         return json_encode(['status' => 1,'msg' => 'success','data' => ['sum_count' => $iCount,'am_id_count' => $am_id_count]]);
     }