任务列表逻辑调整

Modules/OpcData/Http/Controllers/Api/CarDownCurrInfoController.php

@@ -47,15 +47,17 @@ class CarDownCurrInfoController extends BaseController
                left join down_car_base_info t1 on t.car_num = t1.car_num
                left join down_personnel_info t2 on t.driver_num = t2.per_num
               where DATE_FORMAT(apply_time,'%Y-%m-%d') = (select max(DATE_FORMAT(apply_time,'%Y-%m-%d')) FROM down_task_info)
+                and task_state <> '已完成'
               ORDER BY task_state desc, apply_time";
         $list = $this->executeSql($sqlStr);
 
         $sqlStr = /** @lang text */
-            "select task_state, count(1) con from down_task_info
+            "select task_info, count(1) con from down_task_info
               where DATE_FORMAT(apply_time,'%Y-%m-%d') =
                     (select max(DATE_FORMAT(apply_time,'%Y-%m-%d'))
                        FROM down_task_info)
-              GROUP BY task_state";
+                and task_state <> '已完成'
+              GROUP BY task_info";
         $groupCon = $this->executeSql($sqlStr);
 
         $data = [