Преглед на файлове

检测端执行任务 接口修改

gbsong преди 3 години
родител
ревизия
f271feadeb
променени са 3 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 1
      app/api/business/SampleBus.php
  2. 1 1
      app/api/controller/v1/TaskInformation.php
  3. 0 1
      app/api/model/Undertake.php

+ 2 - 1
app/api/business/SampleBus.php

@@ -9,6 +9,7 @@ namespace app\api\business;
 
 use app\api\model\Ccjc;
 use app\api\model\Cyd;
+use app\api\model\Jcdw;
 use app\api\model\TestModel;
 use app\api\model\UnitProduction;
 use app\api\model\UnitSample;
@@ -67,7 +68,7 @@ class SampleBus
         $model_id = (new Ccjc())->getTaskInfoByTaskID($task_id)['test_model_id'];
         $data = (new TestModel())->getProductInfo($model_id);
         $result=(new Arr())->Arr_columns($data, 'product_name,product_id');
-        return $result;
+        return [$result];
 
     }
 

+ 1 - 1
app/api/controller/v1/TaskInformation.php

@@ -16,7 +16,7 @@ class TaskInformation
             'task_id' => request()->param('task_id', null, 'int'),
         ];
         $result = (new TaskInformationBus())->getTaskDetail($data['task_id'], $data['pageNum'], $data['pageSize']);
-        return $result;
+        return showSuccess($result);
     }
 
     //获取抽样任务列表

+ 0 - 1
app/api/model/Undertake.php

@@ -7,7 +7,6 @@
 
 namespace app\api\model;
 
-use think\Collection;
 use think\Model;
 
 class Undertake extends Model