监管查看抽样单列表

app/api/business/CydBus.php

@@ -33,4 +33,16 @@ class CydBus
         $cyd_item = (new Cyd())->getCydDetailBySampleID($sample_id);
         return $cyd_item;
     }
+
+    public function getCydByTaskIdAndUnitId($data,$page)
+    {
+        $where = [
+            ['cyd.task_id','=',$data['task_id']],
+            ['unit_id','=',$data['unit_id']]
+        ];
+
+        $jg_cyd_list = (new Cyd())->getCydListDetail($where,$page['pageNum'],$page['pageSize']);
+        return $jg_cyd_list;
+    }
+
 }

app/api/business/SampleBus.php

@@ -11,6 +11,7 @@ use app\api\model\Ccjc;
 use app\api\model\Cyd;
 use app\api\model\Jcdw;
 use app\api\model\TestModel;
+use app\api\model\Undertake;
 use app\api\model\UnitProduction;
 use app\api\model\UnitSample;
 use app\api\model\UnitTest;
@@ -62,12 +63,21 @@ class SampleBus
         return ['rows'=>$result,'total'=>$count];
     }
 
-    public function getSampleObj($task_id)
+    public function getSampleObj($data)
     {
-        $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;
+
+        $model_id = (new Ccjc())->getTaskInfoByTaskID($data['task_id'])['test_model_id'];
+        $data_tmp = (new TestModel())->getProductInfo($model_id);
+        $result=(new Arr())->Arr_columns($data_tmp, 'product_name,product_id');
+        //根据$data['undertake_id']获取抽样单位和检测单位信息
+        $undertaek_info=(new Undertake())->getItemByUndertakeId($data['undertake_id']);
+
+
+        //根据信息获取抽样单位和检测单位的信息
+        $sample_info = (new Jcdw())->getInfoById($undertaek_info['bear_id']);
+        $check_info = (new Jcdw())->getInfoById($undertaek_info['check_id']);
+        return ['list'=>$result,'sample_info'=>$sample_info,'check_info'=>$check_info];
+//        return $result;
 
     }
 

app/api/controller/v1/Cyd.php

@@ -47,5 +47,21 @@ class Cyd
         return showSuccess($undertake_id['undertake_id']);
     }
 
+    public function getJgCydList()
+    {
+        $data = [
+            'task_id' => request()->param('task_id', '', 'int'),//任务id
+            'unit_id' => request()->param('unit_id', '', 'int'),//牵头单位id
+        ];
+        $page=[
+            'pageNum' => request()->param('pageNum', 1, 'int'),
+            'pageSize' => request()->param('pageSize', null, 'int'),
+
+        ];
+        $result = (new CydBus())->getCydByTaskIdAndUnitId($data,$page);
+        return showSuccess($result);
+
+    }
+
 
 }

app/api/controller/v1/Sample.php

@@ -36,14 +36,18 @@ class Sample
 
     public function getSampleObj()
     {
+        $data =[
+            'task_id' => request()->param('task_id', '', 'int'),
+            'undertake_id'=>request()->param('undertake_id','','int')
+        ];
         $task_id = request()->param('task_id','','int');
         $under_task_id = request()->param('undertake_id', '', 'int');
 
-        if ($task_id == '' || $under_task_id == '') {
+        if ($data['task_id'] == '' || $data['undertake_id'] == '') {
             return showError(config('status.none_valid_data'));
         }
 
-        $result = (new SampleBus())->getSampleObj($task_id);
+        $result = (new SampleBus())->getSampleObj($data);
         return showSuccess($result);
     }
 

app/api/model/Cyd.php

@@ -32,6 +32,29 @@ class Cyd extends Model
         return $this->belongsTo('underTake', 'undertake_id', 'id');
     }
 
+    //监管端获取抽样单
+    public function getCydListDetail($where,$pageNum=1,$pageSize=null)
+    {
+        $result = $this
+            ->alias('cyd')
+            ->field('sample_id,sample_name,cyd.task_id,place,sample_date,sample_status,test_status,brand,level,sample_base,sample_ground,unit_id as lead_id')
+
+            ->leftjoin('t_undertake a','a.id=cyd.undertake_id')
+            ->field('bear_name,check_name,report_name,a.task_id as underTake_task_id')            //bear-抽样单位，report-报告单位，check-检测单位
+
+            ->leftjoin('t_jcdw e','e.id=a.unit_id')
+            ->field('e.name lead_name')//lead_name牵头单位名称
+
+
+            ->leftjoin('t_unit_test b','cyd.id=b.cyd_id')//受检单位
+            ->leftjoin('t_unit_production d','cyd.id=d.cyd_id')//生产单位
+            ->field('unit_test_name,unit_production_name,cyd.undertake_id')
+            ->where($where)
+            ->page($pageNum,$pageSize)
+            ->select();
+        return $result;
+    }
+
     public function getCydListByUndertakeId($undertake_id,$pageNum,$pageSize)
     {
         $data = $this->with(['undertake','unitTest'])
@@ -79,14 +102,14 @@ class Cyd extends Model
         //这里保留两个task_id是为了以后可能会删除一个
         $result = $this
             ->alias('cyd')
-            ->field('sample_id,sample_name,cyd.task_id,place,sample_date,sample_status,test_status')
-            ->leftjoin('t_undertake a','a.id=cyd.undertake_id')
-            //bear-抽样单位，report-报告单位，check-检测单位
+            ->field('sample_id,sample_name,cyd.task_id,place,sample_date,sample_status,test_status,brand,level,sample_base,sample_ground')
+            ->field('unit_test_name,unit_production_name,cyd.undertake_id')
             ->field('bear_name,check_name,report_name,a.task_id as underTake_task_id')
 
+            ->leftjoin('t_undertake a','a.id=cyd.undertake_id')
+            //bear-抽样单位，report-报告单位，check-检测单位
             ->leftjoin('t_unit_test b','cyd.id=b.cyd_id')//受检单位
             ->leftjoin('t_unit_production d','cyd.id=d.cyd_id')//生产单位
-            ->field('unit_test_name,unit_production_name,cyd.undertake_id')
             ->where($where)
             ->page($pageNum,$pageSize)
             ->select();

app/api/model/Undertake.php

@@ -87,4 +87,9 @@ class Undertake extends Model
         return $this->where($where)->count();
     }
 
+    public function getItemByUndertakeId($undertake_id)
+    {
+        return $this->where('id','=',$undertake_id)->find();
+    }
+
 }

app/api/model/UnitSample.php

@@ -15,4 +15,9 @@ class UnitSample extends Model
     {
         return parent::insertGetId($data);
     }
+
+    public function getItemById($id)
+    {
+        return $this->where($id)->find();
+    }
 }

app/api/route/app.php

@@ -27,6 +27,14 @@ Route::group(function () {
     Route::post(":version.isPublicTask",":version.superviser/update");        //改 修改任务状态（发布状态）
     Route::post(":version.getTaskList",":version.superviser/select");        //查找：监管端渲染任务列表-ok
 
+
+    //监管端操作
+    Route::post(":version.getJgCydList",":version.Cyd/getJgCydList");        //监管端查看抽样单
+
+
+
+
+
     //抽样单 相关路由
     Route::post(":version.getCydList",":version.Cyd/getCydList");        //获取抽样单列表
     Route::post(":version.getSampleDetail",":version.Cyd/getCydDetail");        //获取抽样单详情