填报抽样单

填报检测单

app/api/business/CydBus.php

@@ -19,11 +19,18 @@ class CydBus
         return ['rows'=>$data,'total'=>$count];
     }
 
+
     //修改抽样单状态，status=1已上报，0未上报
-    public function updateCydStatus($cyd_id)
+    public function upCydItem($sample_id)
     {
-        $cyd_status = ['status' => '1'];
-        $result = (new Cyd())->updateCydDataByID($cyd_id, $cyd_status);
+        $cyd_status = ['sample_status' => '1'];
+        $result = (new Cyd())->updateCydDataBySampleID($sample_id, $cyd_status);
         return $result;
     }
+
+    public function getCydItemBySampleId($sample_id)
+    {
+        $cyd_item = (new Cyd())->getCydDetailBySampleID($sample_id);
+        return $cyd_item;
+    }
 }

app/api/business/JcdBus.php

@@ -26,4 +26,33 @@ class JcdBus
         return $model_item;
     }
 
+    //修改检测单状态，就是修改cyd表中的，test_status
+    public function upJcdItem($sample_id)
+    {
+        $jcd_status = ['test_status' => '1'];
+        $result = (new Cyd())->updateCydDataBySampleID($sample_id, $jcd_status);
+        return $result;
+    }
+
+    //保存检测单
+    public function saveJcdItem($sample_id, $pesticides){
+        //格式化数据
+        $data = [];
+        foreach ($pesticides as $k0 =>$v0) {
+            $data [$k0]['test_name'] = $pesticides[$k0]['test_name'];
+            $data [$k0]['test_id'] = $pesticides[$k0]['test_id'];
+            $data [$k0]['test_value'] = $pesticides[$k0]['test_value'];
+            $data [$k0]['state_value'] = $pesticides[$k0]['state_value'];
+            $data [$k0]['unit'] = $pesticides[$k0]['unit'];
+            $data [$k0]['creattime'] = $pesticides[$k0]['creattime'];
+            $data [$k0]['sample_id'] = $sample_id;
+            $data [$k0]['LOD'] = $pesticides[$k0]['LOD'];
+            $data [$k0]['LOQ'] = $pesticides[$k0]['LOQ'];
+            $data [$k0]['test_result'] = $pesticides[$k0]['test_result'];
+        }
+
+        return $data;
+    }
+
+
 }

app/api/controller/v1/Cyd.php

@@ -30,20 +30,22 @@ class Cyd
         return showSuccess($result);
     }
 
-    public function updateCydStatus()
-    {
-        $cyd_id = request()->param('cyd_id', '', 'int');
-        $result = (new CydBus())->updateCydStatus($cyd_id);
-        return showSuccess($result);
-    }
 
     public function getCydDetail()
     {
         $sample_id = request()->param('sample_id', '', 'trim');
         $result = (new SampleBus())->getCydDetail($sample_id);
-        return $result;
+        return showSuccess($result);
     }
 
+    public function upCydItem()
+    {
+        $sample_id = request()->param('sample_id', '', 'trim');
+        $result = (new CydBus())->upCydItem($sample_id);
+        //返回一个undertake_id，前端要用这个刷新页面
+        $undertake_id = (new CydBus())->getCydItemBySampleId($sample_id);
+        return showSuccess($undertake_id[0]['undertake_id']);
+    }
 
 
 }

app/api/controller/v1/Jcd.php

@@ -29,6 +29,45 @@ class Jcd
         ];
         $result = (new JcdBus())->getModelItemBySampleID($data['sample_id']);
         return showSuccess($result);
+    }
+
+    //上报检测单--是修改cyd中的test_status，0表示未检测，1表示已检测
+    public function upJcdItem()
+    {
+        $sample_id = request()->param('sample_id', '', 'trim');
+        $result = (new JcdBus())->upJcdItem($sample_id);
+        //返回一个undertake_id，前端要用这个刷新页面
+        $undertake_id = (new CydBus())->getCydItemBySampleId($sample_id);
+        return showSuccess($undertake_id[0]['undertake_id']);
+    }
 
+    //保存检测单
+    public function saveJcdItem()
+    {
+        $sample_id = request()->param('sample_id', '', 'trim');
+        $pesticides = request()->param('pesticides', '', 'trim');
+
+        $result = (new JcdBus())->saveJcdItem($sample_id, $pesticides);
+        return showSuccess($result);
     }
+//
+//    public function 123123(){
+//        $data=$this->request->post();
+//        $id = '';
+//        $test_result=1;
+//        $islog = Db::name('sample_pesticides')->where('sample_id',$data['sample_id'])->select();
+//        if (count($islog)!=0){
+//            return $this->jsonResponse(-1,'不要重复提交检测信息',$islog);
+//        }
+//        foreach ($data['pesticides'] as $k=>$v){
+//            $v['sample_id']=$data['sample_id'];
+//            $idv=Db::name('sample_pesticides')->insertGetId($v);
+//            $id.=$idv.',';
+//            if ($v['test_result']=='不合格'){
+//                $test_result=0;
+//            }
+//        }
+//        $res=Db::name('cyd')->where('sample_id',$data['sample_id'])->update(['jc_value_id'=>$id,'test_result'=>$test_result]);
+//        return $this->jsonSuccessData($res);
+//    }
 }

app/api/model/Cyd.php

@@ -17,7 +17,7 @@ class Cyd extends Model
         return $this->belongsTo('unitProduction', 'product_unit','id');
     }
 
-    function unitTest()
+    function unitTest()//受检单位
     {
         return $this->belongsTo('unitTest', 'units_id', 'id');
     }
@@ -34,7 +34,7 @@ class Cyd extends Model
 
     public function getCydListByUndertakeId($undertake_id,$pageNum,$pageSize)
     {
-        $data = $this->with('undertake')
+        $data = $this->with(['undertake','unitTest'])
             ->where('undertake_id', '=', $undertake_id)
             ->page($pageNum,$pageSize)
             ->select();
@@ -42,7 +42,7 @@ class Cyd extends Model
     }
     public function countCydListByUndertakeId($undertake_id)
     {
-        $data = $this->with('undertake')
+        $data = $this->with(['undertake','unitTest'])
             ->where('undertake_id', '=', $undertake_id)
             ->count();
         return $data;
@@ -134,4 +134,10 @@ class Cyd extends Model
     {
         return $this->where('sample_id', '=', $sample_id)->find();
     }
+
+
+    public function updateCydDataBySampleID($sample_id, $data)
+    {
+        return $this->where('sample_id', '=', $sample_id)->save($data);
+    }
 }

app/api/route/app.php

@@ -15,6 +15,10 @@ Route::group(function () {
     //检测单 相关路由
     Route::post(":version.getJcdList",":version.Jcd/getJcdList");        //获取检测单列表
     Route::post(":version.getJcdObjectItem",":version.Jcd/getJcdObjectItem");        //填报检测单
+    Route::post(":version.upJcdItem",":version.Jcd/upJcdItem");        //上报检测单
+    Route::post(":version.saveJcdItem",":version.Jcd/saveJcdItem");        //上报检测单
+    //Route::post(":version.saveSamplePesticides",":version.index/saveSamplePesticides");        //登录
+
 
     //监管单位路由
     Route::post(":version.AddTask",":version.superviser/create");        //增 添加任务
@@ -25,7 +29,8 @@ Route::group(function () {
     //抽样单 相关路由
     Route::post(":version.getCydList",":version.Cyd/getCydList");        //获取抽样单列表
     Route::post(":version.getSampleDetail",":version.Cyd/getCydDetail");        //获取抽样单详情
-    Route::post(":version.updateCydStatus",":version.Cyd/updateCydStatus");        //修改抽样单上报状态
+    Route::post(":version.upCydItem",":version.Cyd/upCydItem");        //上报抽样单
+
     //填报抽样单
     Route::post(":version.getTestObj",":version.Sample/getSampleObj");        //填报抽样单-step1 获取信息
     Route::post(":version.saveSample",":version.Sample/createSample");        //填报抽样单-step2 保存信息