update

app/api/business/ModelBus.php

@@ -43,7 +43,7 @@ class ModelBus
     }
 
     //获取模型信息
-    public function getModelInfo($tmp_data)
+    public function getModelInfoByModelId($tmp_data)
     {
         $model_id = $tmp_data['id'];
         $model_info=(new TestModel())->getModelInfoByModelID($model_id);//获取模型信息
@@ -57,6 +57,17 @@ class ModelBus
         return $data;
     }
 
+    //获取模型信息
+    public function getModelInfoByTaskId($data)
+    {
+        $task_id = $data['task_id'];
+
+        $test_model_id['id'] = (new Ccjc())->getTaskInfoByTaskID($task_id)['test_model_id'];
+        $model_info = $this->getModelInfoByModelId($test_model_id);
+        return $model_info;
+
+    }
+
     public function updateInfoByTaskID($data)
     {
         $task_id = $data['task_id'];

app/api/business/QianTouBus.php

@@ -7,6 +7,7 @@
 
 namespace app\api\business;
 
+use app\api\exception\ApiException;
 use app\api\model\Ccjc;
 use app\api\model\Jgry;
 use app\api\model\Orgs;
@@ -36,7 +37,8 @@ class QianTouBus
     {
         $where=[
             ['unit_id','=',$this->uid],
-            ['task_class','=',$data['task_class']]
+            ['task_class', '=', $data['task_class']],
+            ['ispublic','>',0]//获取到的任务状态必须大于0，是已经发布过的任务
         ];
         if ($data['task_name'] != '' ) $where[] = ['task_name', 'LIKE', '%' . $data['task_name'] . '%'];
         if ($data['ispublic'] != '') $where[] = ['ispublic', '=', $data['ispublic']];
@@ -52,6 +54,13 @@ class QianTouBus
     //牵头单位发布任务
     public function releaseTask($task_id)
     {
+        //发布任务之前检查一下任务是否绑定模型，没绑定模型禁止发布
+        $test_model_id = (new Ccjc())->getTaskInfoByTaskID($task_id)['test_model_id'];
+        if ($test_model_id == '') {
+            throw new ApiException(config('status.none_model_info'));
+        }
+
+        //已经绑定模型，允许发布任务
         $data=['ispublic' => 5];//发布任务
         $result = (new Ccjc())->updateInfoByTaskID($task_id, $data);
         return $result;

app/api/controller/v1/Model.php

@@ -54,7 +54,7 @@ class Model
     }
 
     //获取模型信息
-    public function getModelInfo()
+    public function getModelInfoByModelId()
     {
 
         $data['id'] = request()->param('id', '', 'int');
@@ -64,7 +64,15 @@ class Model
         } catch (ValidateException $exception) {
             return showError($exception->getError());
         }
-        $result = (new ModelBus())->getModelInfo($data);
+        $result = (new ModelBus())->getModelInfoByModelId($data);
+        return showSuccess($result);
+    }
+
+    //获取模型信息
+    public function getModelInfoByTaskId()
+    {
+        $data['task_id'] = request()->param('task_id', '', 'int');
+        $result = (new ModelBus())->getModelInfoByTaskId($data);
         return showSuccess($result);
     }
 

app/api/controller/v1/SGB.php

@@ -7,10 +7,9 @@ use app\api\model\TestModel;
 class SGB
 {
 
+    //自己用来测试接口的
     public function index()
     {
-        $model_id = request()->param('model_id');
-        $result = (new TestModel())->getProductInfo($model_id,$where='');
-        return showSuccess($result);
+        return showSuccess('1');
     }
 }

app/api/route/app.php

@@ -30,8 +30,9 @@ Route::group(function () {
     Route::post(":version.bindModel",":version.Model/bindModel");                               //在执行任务中绑定模型        #模型     #绑定
     Route::post(":version.saveModel",":version.Model/createModelInfo");                         //创建模型信息                #模型     #创建
     Route::post(":version.delModel",":version.Model/deleteModelInfo");                           //删除模型
-    Route::post(":version.getModeldetail",":version.Model/getModelInfo");                       //获取某个模型的详情信息
-    Route::post(":version.DoEditModelInfo",":version.Model/updateModelInfo");                   //修改模型详情
+    Route::post(":version.DoEditModelInfo",":version.Model/updateModelInfo");                   //修改模型详情（通过模型id）
+    Route::post(":version.getModeldetail",":version.Model/getModelInfoByModelId");                       //获取某个模型的详情信息（通过模型id）
+    Route::post(":version.getModelInfo",":version.Model/getModelInfoByTaskId");                       //获取某个模型的详情信息（通过任务id）
     Route::post(":version.getPesticidesList",":version.Model/selectPesticidesList");            //获取检测项目列表         #模型中 #修改检测项目 #获取检测项目
     Route::post(":version.getProductList",":version.Model/selectProductList");                 //获取检测对象列表         #模型中 #修改检测对象 #获取检测对象
 
@@ -43,6 +44,7 @@ Route::group(function () {
     Route::post(":version.getTaskTest",":version.QianTou/selectQtTaskList");                  //获取牵头单位所属任务        #牵头
     Route::post(":version.getTaskDetail",":version.QianTou/getTaskInfo");                     //获取任务信息                 #牵头     #任务     #detail
 
+
     Route::post(":version.AddUnderTask",":version.QianTou/createUnderTaker");                    //在牵头单位中 创建承担任务
     Route::post(":version.delUnderTask",":version.QianTou/deleteUnderTaskList");                //牵头单位中 删除创建的承担任务
     Route::post(":version.getTaskBaseInfo",":version.QianTou/getTaskBaseInfo");                //牵头单位中 获取任务的基本信息