wesmiler

app/Services/Api/TaskService.php

@@ -66,6 +66,8 @@ class TaskService extends BaseService
 
         $datas = $datas? $datas->toArray() : [];
         $power = 0;
+        $num = 0;
+        $complete = 0;
         if($datas){
             foreach ($datas as &$item){
                 $item['status'] = 1;
@@ -80,17 +82,19 @@ class TaskService extends BaseService
                 if($item['check_type'] == 1 && $item['num']<=$logNum){
                     $item['status'] = 2;
                     $item['log_num'] = $logNum;
+                    $complete++;
                 }
                 // 时长
                 else if($item['check_type'] == 2 && $logNum>0){
                     $item['status'] = 2;
                     $item['log_num'] = $logNum;
+                    $complete++;
                 }
             }
             unset($item);
         }
 
-        return ['power'=>$power, 'list'=> $datas];
+        return ['power'=>$power,'complete'=>$complete,'num'=>count($datas), 'list'=> $datas];
     }
 
     /**