检测单保存

app/api/business/JcdBus.php

@@ -61,20 +61,22 @@ class JcdBus
         $data = [];//需要保存的数据
         $data_num =0;//一共有多少个需要保存的数据
         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'];
-            $data [$k0]['enable_save'] = 1;//将enable_save置1，禁止后续修改
-            $data_num = $k0;
+            if ($pesticides[$k0]['test_value'] != '') {
+                $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'];
+                $data_num = $k0;
+            }
         }
 
+
+
         $disable_save_data=$enable_save_data=[];
         //查找数据，如果enable_save==0,则无法保存，为null则可以保存
 
@@ -86,8 +88,12 @@ class JcdBus
                 $disable_save_data[] = ['test_id' => $data[$i]['test_id'], 'sample_id' => $sample_id];
             }
             //如果enable_save为null可以保存
-            else if ($save_data['enable_save'] == null) {
+            else if ($save_data['enable_save'] == null && $save_data['test_value']=='') {
+                //添加数据
                 (new SamplePesticides())->saveItemByTestIdAndSampleId($data[$i]['test_id'], $sample_id, $data[$i]);
+                //根据item_id将对应的enable_save字段置1，禁止二次保存
+                (new SamplePesticides())->saveItemByTestIdAndSampleId($data[$i]['test_id'], $sample_id,['enable_save' => 1]);
+
                 $enable_save_data[] = ['test_id' => $data[$i]['test_id'], 'sample_id' => $sample_id];
             }
             else{
@@ -99,5 +105,13 @@ class JcdBus
 
     }
 
+    //生成检测报告单
+    public function createTestValue($sample_id)
+    {
+        $res['result_detail']=Db::name('sample_pesticides')->where('sample_id',$data['sample_id'])->select();
+        $res['result']=Db::name('cyd')->where('sample_id',$data['sample_id'])->find();
+        return $this->jsonSuccessData($res);
+    }
+
 
 }

app/api/controller/v1/Jcd.php

@@ -52,4 +52,12 @@ class Jcd
         return showSuccess($result);
     }
 
+    //生成检测报告单
+    public function createTestValue(){
+
+        $sample_id = request()->param('sample_id', '', 'trim');
+        $result = (new JcdBus())->createTestValue($sample_id);
+        return $result;
+
+    }
 }

app/api/model/SamplePesticides.php

@@ -34,8 +34,22 @@ class SamplePesticides extends Model
             ['test_id', '=', $test_id],
             ['sample_id', '=', $sample_id]
         ])
-            ->failException(false)
             ->save($data);
     }
 
+    public function updateItemByTestIdAndSampleId($test_id, $sample_id, $data)
+    {
+        $result= $this->where([
+            ['test_id', '=', $test_id],
+            ['sample_id', '=', $sample_id]
+        ])
+            ->update($data);
+        return $result;
+    }
+
+    public function saveItemById($id, $data)
+    {
+        return $this->where($id)->save($data);
+    }
+
 }

app/api/route/app.php

@@ -16,8 +16,9 @@ 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.saveJcdItem",":version.Jcd/saveJcdItem");        //保存检测项目的检测值
+    Route::post(":version.getTestValue",":version.Jcd/createTestValue");        //生成检测报告
+
 
 
     //监管单位路由
@@ -101,7 +102,6 @@ PATCH（UPDATE）：在服务器更新资源（客户端提供改变的属性）
 //Route::post(":version.getTestPesticides",":version.index/getTestPesticides");        //登录
 //Route::post(":version.saveSamplePesticides",":version.index/saveSamplePesticides");        //登录
 //Route::post(":version.editSamplePesticides",":version.index/editSamplePesticides");        //登录
-//Route::post(":version.getTestValue",":version.index/getTestValue");        //登录
 //Route::post(":version.saveTestFile",":version.index/saveTestFile");        //登录
 //Route::post(":version.getUnitsFileList",":version.index/getUnitsFileList");        //登录
 //Route::post(":version.getGovFileList",":version.index/getGovFileList");        //登录