检测端执行任务 接口修改

app/api/business/OrganizerTaskBus.php

@@ -88,6 +88,8 @@ class OrganizerTaskBus
         $reportTaskList_info=(new Undertake())->selectTaskListByTaskIdAndUid($task_id,'','',$uid,$pageNum,$pageSize);
         $reportTaskList_total = (new Undertake())->countTaskListByTaskIdAndUid($task_id, '','',$uid);
 
+
+
         $data=[
             'taskInfo'=>$task_info,
             'releaserInfo'=>$task_releaser_info,

app/api/business/TaskInformationBus.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace app\api\business;
+
+use app\api\model\Ccjc;
+use app\api\model\Jgry;
+use app\api\model\TestModel;
+use app\api\model\Undertake;
+use app\common\lib\auth\JwtAuth;
+
+class TaskInformationBus
+{
+
+    private $uid;
+    public function __construct()
+    {
+        $jwtAuth= JwtAuth::getInstance();            //实例化jwtAuth
+        $this->uid = $jwtAuth->getUid();          //setRybh是在middleware/jwtAuth中完成的
+    }
+
+    public function getTaskDetail($task_id,$pageNum=1,$pageSize=null)
+    {
+        //任务信息
+        $task_info = (new Ccjc())->getTaskInfoByTaskID($task_id);
+        $task_releaser_info = (new Jgry())->getJgryInfoByRymc($task_info['releaser']);
+        //获取uid下创建的所有模型信息
+        if (isset($task_info['test_model_id'])) {
+            $task_product_info = (new TestModel())->getProductInfo($task_info['test_model_id']);
+            $task_pesticides_info = (new TestModel())->getPesticidesInfo($task_info['test_model_id']);
+            $task_model_info=(new TestModel())->getModelInfoByModelID($task_info['test_model_id']);
+
+        }else{
+            $task_product_info ='';
+            $task_pesticides_info='';
+            $task_model_info='';
+        }
+
+        $result = [
+            'taskInfo'=>$task_info,
+            'releaserInfo'=>$task_releaser_info,
+            'product'=>$task_product_info,
+            'pesticides'=>$task_pesticides_info,
+            'modelInfo'=>$task_model_info,
+
+        ];
+        return $result;
+    }
+
+    //获取抽样任务列表
+    public function getSampleTaskList($task_id,$pageNum=1,$pageSize=null)
+    {
+        $uid = $this->uid;
+        $where = ['bear_id', '=', $uid];
+        $sample_task_list = (new Undertake())->selectByTaskIdAndWhere($task_id,$where,$pageNum,$pageSize);
+        $count = (new Undertake())->countByTaskIdAndWhere($task_id,$where);
+        return ['rows'=>$sample_task_list,'count'=>$count];
+    }
+
+    //获取检测任务列表
+    public function getCheckTaskList($task_id,$pageNum=1,$pageSize=null)
+    {
+        $uid = $this->uid;
+        $where = ['check_id', '=', $uid];
+        $sample_task_list = (new Undertake())->selectByTaskIdAndWhere($task_id,$where,$pageNum,$pageSize);
+        $count = (new Undertake())->countByTaskIdAndWhere($task_id,$where);
+        return ['rows'=>$sample_task_list,'count'=>$count];
+    }
+
+
+    //获取报告上传任务列表
+    public function getReportTaskList($task_id,$pageNum=1,$pageSize=null)
+    {
+        $uid = $this->uid;
+        $where = ['report_id', '=', $uid];
+        $sample_task_list = (new Undertake())->selectByTaskIdAndWhere($task_id,$where,$pageNum,$pageSize);
+        $count = (new Undertake())->countByTaskIdAndWhere($task_id,$where);
+        return ['rows'=>$sample_task_list,'count'=>$count];
+    }
+
+}

app/api/controller/v1/TaskInformation.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace app\api\controller\v1;
+
+use app\api\business\TaskInformationBus;
+
+class TaskInformation
+{
+
+    //获取任务详情
+    public function getTaskDetail()
+    {
+        $data = [
+            'pageNum' => request()->param('pageNum', 1, 'int'),
+            'pageSize' => request()->param('pageSize', null, 'int'),
+            'task_id' => request()->param('task_id', null, 'int'),
+        ];
+        $result = (new TaskInformationBus())->getTaskDetail($data['task_id'], $data['pageNum'], $data['pageSize']);
+        return $result;
+    }
+
+    //获取抽样任务列表
+    public function getSampleTaskList()
+    {
+        $data = [
+            'pageNum' => request()->param('pageNum', 1, 'int'),
+            'pageSize' => request()->param('pageSize', null, 'int'),
+            'task_id' => request()->param('task_id', null, 'int'),
+        ];
+        $result = (new TaskInformationBus())->getSampleTaskList($data['task_id'], $data['pageNum'], $data['pageSize']);
+        return showSuccess($result);
+    }
+
+    //获取检测任务列表
+    public function getCheckTaskList()
+    {
+        $data = [
+            'pageNum' => request()->param('pageNum', 1, 'int'),
+            'pageSize' => request()->param('pageSize', null, 'int'),
+            'task_id' => request()->param('task_id', null, 'int'),
+        ];
+        $result = (new TaskInformationBus())->getCheckTaskList($data['task_id'], $data['pageNum'], $data['pageSize']);
+        return showSuccess($result);
+
+    }
+
+    //获取报告上传任务列表
+    public function getReportTaskList()
+    {
+        $data = [
+            'pageNum' => request()->param('pageNum', 1, 'int'),
+            'pageSize' => request()->param('pageSize', null, 'int'),
+            'task_id' => request()->param('task_id', null, 'int'),
+        ];
+        $result = (new TaskInformationBus())->getReportTaskList($data['task_id'], $data['pageNum'], $data['pageSize']);
+        return showSuccess($result);
+    }
+
+}

app/api/model/Undertake.php

@@ -7,6 +7,7 @@
 
 namespace app\api\model;
 
+use think\Collection;
 use think\Model;
 
 class Undertake extends Model
@@ -21,6 +22,33 @@ class Undertake extends Model
         return $this->select($id_arr)->delete();
     }
 
+    //获取抽样任务列表
+    public function selectByTaskIdAndWhere($task_id, $where='',$pageNum=1,$pageSize=null)
+    {
+        if ($task_id == '' || $where == '') {
+            return false;
+        }
+        return $this->where([
+            ['task_id', '=', $task_id],
+            [$where]
+        ])
+            ->page($pageNum,$pageSize)
+            ->select();
+    }
+
+    //获取抽样任务列表数量
+    public function countByTaskIdAndWhere($task_id, $where='')
+    {
+        if ($task_id == '' || $where == '') {
+            return false;
+        }
+        return $this->where([
+            ['task_id', '=', $task_id],
+            [$where]
+        ])
+            ->count();
+    }
+
 
     public function selectTaskListByTaskIdAndUid($task_id,$unit_id='',$bear_id='',$report_id='',$pageNum=1,$pageSize=null)
     {

app/api/route/app.php

@@ -18,7 +18,7 @@ Route::group(function () {
     Route::post(":version.isPublicTask",":version.superviser/update");        //改 修改任务状态（发布状态）
     Route::post(":version.getTaskList",":version.superviser/select");        //查找：监管端渲染任务列表-ok
 
-    //抽样单相关路由
+    //抽样单 相关路由
     Route::post(":version.getCydList",":version.Cyd/getCydList");        //获取抽样单列表
     Route::post(":version.getSampleDetail",":version.Cyd/getCydDetail");        //获取抽样单详情
     Route::post(":version.updateCydStatus",":version.Cyd/updateCydStatus");        //修改抽样单上报状态
@@ -28,7 +28,7 @@ Route::group(function () {
     Route::post(":version.getSampleId",":version.Sample/createSampleId");        //抽样单中生成样品编码
 
 
-    //检测单相关路由
+    //检测单 相关路由
     Route::post(":version.getJcdList",":version.Jcd/getJcdList");        //获取检测单列表
     Route::post(":version.saveJcdList",":version.Jcd/saveJcdInfo");        //填报检测单列表
 
@@ -54,14 +54,16 @@ Route::group(function () {
 
     //承担单位相关路由
     Route::post(":version.getTaskcd",":version.Undertaker/selectUndertakerTaskList");      //承担单位获取承担单位任务列表
-    //  Route::post(":version.getTaskDetail",":version.Organizer/getTaskInfo");        //获取任务信息--same牵头单位路由获取任务信息
+    //Route::post(":version.getTaskDetail",":version.Organizer/getTaskInfo");        //获取任务信息--same牵头单位路由获取任务信息,写在下面了
     Route::post(":version.getSampleList",":version.Sample/selectSampleList");        // 查询抽样单详细信息列表
-//    Route::post(":version.getUnderTask",":version.index/getUnderTask");      //获取承担单位--same牵头单位路由获取承担单位信息
-
-
-
+    //Route::post(":version.getUnderTask",":version.index/getUnderTask");      //获取承担单位--same牵头单位路由获取承担单位信息
 
 
+    //执行检测-承担单位中，执行检测获取任务信息
+    Route::post(":version.getTaskInfo",":version.TaskInformation/getTaskDetail");      //获取任务详情
+    Route::post(":version.getSampleTaskList",":version.TaskInformation/getSampleTaskList");//获取抽样任务列表
+    Route::post(":version.getCheckTaskList",":version.TaskInformation/getCheckTaskList");//获取检测任务列表
+    Route::post(":version.getReportTaskList",":version.TaskInformation/getReportTaskList");//获取报告上传任务列表
 
 
     //通用的路由，获取检测单位，抽样单位
@@ -70,7 +72,7 @@ Route::group(function () {
 })->allowCrossDomain()->middleware(JwtAuth::class);
 
 //通用库的controller路由
-Route::post(":version.ossUpload",":version.Upload/upload")->allowCrossDomain();       //上传文件到oss todo 增加工厂模式
+Route::post(":version.ossUpload",":version.Upload/upload")->allowCrossDomain();       //上传文件到oss
 
 /**
  *