update getsamplelist

app/api/business/SampleBus.php

@@ -31,7 +31,7 @@ class SampleBus
         $uid = $this->uid;
         $where=[
             ['task_id', '=', $task_id],
-            ['sample_unit', '=', $uid]
+            ['uid', '=', $uid]
         ];
         $result = (new Cyd())->selectSampleListByTaskIdAndUid($where, $pageNum, $pageSize);
         $count = (new Cyd())->countSampleListByTaskIdAndUid($where);
@@ -68,7 +68,7 @@ class SampleBus
         //写入抽样单信息，并返回抽样单cyd ID
         $cyd_id = (new Cyd())->createSample($cyd_data);
 
-        //写入cydID
+        //赋值cydID
         $unit_test['cyd_id']=$unit_production['cyd_id']=$unit_sample['cyd_id']=$cyd_id;
 
         //写入受检单位信息，并返回自增id
@@ -80,6 +80,7 @@ class SampleBus
 
         //将各种id写入cyd
         $cyd_id_data = [
+            'uid' => $this->uid,
             'test_id' => '',//检测单位id
             'units_id' => $unit_test_id,//受检单位id
             'product_unit' => $unit_production_id,//生产单位id

app/api/controller/v1/Sample.php

@@ -41,64 +41,64 @@ class Sample
 
         //受检单位信息
         $unit_test = [
-            'unit_name' => request()->param('units.units_name','','trim'),//单位名称
-            'address' => request()->param('units.address'),//通讯地址
-            'represent_name' => request()->param('units.corporation','','trim'),//法定代表人
-            'user_name' => request()->param('units.user_name','','trim'),//*受检人
-            'phone' => request()->param('units.phone','','trim'),//电话
-            'fax' => request()->param('units.fax','','trim'),//传真
+            'unit_name' => request()->param('unit_test.unit_name','','trim'),//单位名称
+            'address' => request()->param('unit_test.address'),//通讯地址
+            'represent_name' => request()->param('unit_test.represent_name','','trim'),//法定代表人
+            'user_name' => request()->param('unit_test.user_name','','trim'),//*受检人
+            'phone' => request()->param('unit_test.phone','','trim'),//电话
+            'fax' => request()->param('unit_test.fax','','trim'),//传真
         ];
 
         //生产单位信息
         $unit_production = [
-            'production_name' =>request()->param('production.production_name','','trim'),//单位名称
-            'address' =>request()->param('production.p_address','','trim'),//通讯地址
-            'postcode' =>request()->param('production.p_postcode','','trim'),//邮编
-            'user_name' =>request()->param('production.p_user_name','','trim'),//联系人
-            'phone' =>request()->param('production.p_phone','','trim'),//电话
-            'fax' =>request()->param('production.p_fax','','trim'),//传真
-            'production_class' =>request()->param('production.production_class','','trim'),//生产方式
+            'production_name' =>request()->param('unit_production.production_name','','trim'),//单位名称
+            'address' =>request()->param('unit_production.address','','trim'),//通讯地址
+            'postcode' =>request()->param('unit_production.postcode','','trim'),//邮编
+            'user_name' =>request()->param('unit_production.user_name','','trim'),//联系人
+            'phone' =>request()->param('unit_production.phone','','trim'),//电话
+            'fax' =>request()->param('unit_production.fax','','trim'),//传真
+            'production_class' =>request()->param('unit_production.production_class','','trim'),//生产方式
         ];
 
         //抽样单位信息
         $unit_sample = [
-            'unit_name' => request()->param('sampleUnit.sample_unit_name','','trim'),//单位名称
-            'unit_user' => request()->param('sampleUnit.sample_unit_user','','trim'),//联系人
-            'address' => request()->param('sampleUnit.sample_unit_address','','trim'),//通讯地址
-            'postcode' => request()->param('sampleUnit.sample_unit_postcode','','trim'),//邮编
-            'phone' => request()->param('sampleUnit.sample_unit_phone','','trim'),//联系电话
-            'fax' => request()->param('sampleUnit.sample_unit_fax','','trim'),//传真
-            'email' => request()->param('sampleUnit.sample_unit_email','','trim'),//Email
+            'unit_name' => request()->param('unit_sample.unit_name','','trim'),//单位名称
+            'unit_user' => request()->param('unit_sample.unit_user','','trim'),//联系人
+            'address' => request()->param('unit_sample.address','','trim'),//通讯地址
+            'postcode' => request()->param('unit_sample.postcode','','trim'),//邮编
+            'phone' => request()->param('unit_sample.phone','','trim'),//联系电话
+            'fax' => request()->param('unit_sample.fax','','trim'),//传真
+            'email' => request()->param('unit_sample.email','','trim'),//Email
         ];
 
-//抽样单cyd信息
+        //抽样单cyd信息
         $cyd_data = [
-            'sample_id' => request()->param('sample_id','','trim'),//抽样单的id
-            'task_id' => request()->param('task_id','','trim'),//关联任务id
-            'test_id' => request()->param('test_id','','trim'),//检测单位id-------todo 这个怎么填！！！！！！！！！！！！
+            'sample_id' => request()->param('cyd_data.sample_id','','trim'),//抽样单的id///todo
+            'task_id' => request()->param('cyd_data.task_id','','trim'),//关联任务id todo
+            'test_id' => request()->param('test_id','','trim'),//检测单位id----todo 未赋值
 
-            'units_id' => request()->param('units_id','','trim'),//受检单位id
-            'product_unit' => request()->param('product_unit','','trim'),//生产单位id
-            'sample_unit' => request()->param('sample_unit','','trim'),//抽样单位id
+//            'units_id' => request()->param('units_id','','trim'),//受检单位id---在business中赋值
+//            'product_unit' => request()->param('product_unit','','trim'),//生产单位id---在business中赋值
+//            'sample_unit' => request()->param('sample_unit','','trim'),//抽样单位id---在business中赋值
 
-            'sample_name' => request()->param('sample_name','','trim'),//样品名称
-            'brand' => request()->param('brand','','trim'),//商标
-            'ispack' => request()->param('ispack','','trim'),//包装
-            'type' => request()->param('type','','trim'),//型号规格
-            'standard' => request()->param('standard','','trim'),//执行标准
-            'production_date' => request()->param('production_date','','trim'),//生产日期或批号
-            'place' => request()->param('place','','trim'),//	产地
-            'certicfie' => request()->param('certicfie','','trim'),//*产品认证情况
-            'certifie_num' => request()->param('certifie_num','','trim'),//证书编号
-            'sample_num' => request()->param('sample_num','','trim'),//*抽样数量
-            'sample_num_unit' => request()->param('sample_num_unit','','trim'),//*抽样数量单位
-            'sample_base' => request()->param('sample_base','','trim'),//抽样基数
-            'sample_base_unit' => request()->param('sample_base_unit','','trim'),//抽样基数单位
-            'sample_ground' => request()->param('sample_ground','','trim'),//*抽样场所
-            'base' => request()->param('base', '', 'trim'),//检测任务依据
-            'sample_date'=>request()->param('sample_date','','trim'),//抽样时间
-            'file_name' => request()->param('file_name','','trim'),//文件名
-            'file_url' => request()->param('file_url','','trim'),//文件链接
+            'sample_name' => request()->param('cyd_data.sample_name','','trim'),//样品名称
+            'brand' => request()->param('cyd_data.brand','','trim'),//商标
+            'ispack' => request()->param('cyd_data.ispack','','trim'),//包装
+            'type' => request()->param('cyd_data.type','','trim'),//型号规格
+            'standard' => request()->param('cyd_data.standard','','trim'),//执行标准
+            'production_date' => request()->param('cyd_data.production_date','','trim'),//生产日期或批号
+            'place' => request()->param('cyd_data.place','','trim'),//	产地
+            'certicfie' => request()->param('cyd_data.certicfie','','trim'),//*产品认证情况
+            'certifie_num' => request()->param('cyd_data.certifie_num','','trim'),//证书编号
+            'sample_num' => request()->param('cyd_data.sample_num','','trim'),//*抽样数量
+            'sample_num_unit' => request()->param('cyd_data.sample_num_unit','','trim'),//*抽样数量单位
+            'sample_base' => request()->param('cyd_data.sample_base','','trim'),//抽样基数
+            'sample_base_unit' => request()->param('cyd_data.sample_base_unit','','trim'),//抽样基数单位
+            'sample_ground' => request()->param('cyd_data.sample_ground','','trim'),//*抽样场所
+            'base' => request()->param('cyd_data.base', '', 'trim'),//检测任务依据
+            'sample_date'=>request()->param('cyd_data.sample_date','','trim'),//抽样时间
+            'file_name' => request()->param('cyd_data.file_name','','trim'),//文件名
+            'file_url' => request()->param('cyd_data.file_url','','trim'),//文件链接
         ];
 
         $result = (new SampleBus())->createSample($unit_test, $unit_production, $unit_sample, $cyd_data);

app/api/model/Cyd.php

@@ -11,27 +11,32 @@ use think\Model;
 
 class Cyd extends Model
 {
-    function production()
+    function unitProduction()
     {
-        return $this->belongsTo('production', 'product_unit','id');
+        return $this->belongsTo('unitProduction', 'product_unit','id');
     }
 
-    function unitsTest()
+    function unitTest()
     {
-        return $this->belongsTo('unitsTest', 'units_id', 'id');
+        return $this->belongsTo('unitTest', 'units_id', 'id');
+    }
+
+    function unitSample()
+    {
+        return $this->belongsTo('unitSample', 'sample_unit', 'id');
     }
 
 
     public function selectSampleListByTaskIdAndUid($where,$pageNum=1,$pageSize=null)
     {
         $cyd = (new Cyd());
-        $data = $cyd->with(['Production', 'UnitsTest'])->where($where)->page($pageNum,$pageSize)->select();
+        $data = $cyd->with(['unitProduction', 'unitTest','unitSample'])->where($where)->page($pageNum,$pageSize)->select();
         return $data;
     }
     public function countSampleListByTaskIdAndUid($where)
     {
         $cyd = (new Cyd());
-        $count = $cyd->with(['Production', 'UnitsTest'])->where($where)->count();
+        $count = $cyd->with(['unitProduction', 'unitTest','unitSample'])->where($where)->count();
         return $count;
     }
 

app/api/model/Production.php

@@ -1,15 +0,0 @@
-<?php
-/**
- *
- *User:Administrator
- *Date:2021/10/14
- */
-
-namespace app\api\model;
-
-use think\Model;
-
-class Production extends Model
-{
-
-}