add creatSampleData

.env

@@ -0,0 +1 @@
+APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[LANG]
default_lang = zh-cn

app/api/business/SampleBus.php

@@ -10,6 +10,9 @@ namespace app\api\business;
 use app\api\model\Ccjc;
 use app\api\model\Cyd;
 use app\api\model\TestModel;
+use app\api\model\UnitProduction;
+use app\api\model\UnitSample;
+use app\api\model\UnitTest;
 use app\common\lib\Arr;
 use app\common\lib\auth\JwtAuth;
 
@@ -60,13 +63,31 @@ class SampleBus
 
 
 
-    public function createSample()
+    public function createSample($unit_test,$unit_production,$unit_sample,$cyd_data)
     {
-        ///todo 没写呢
-        $res=Db::name('cyd')->strict(false)->insert($data);
-        $data['units_id']=Db::name('units_test')->strict(false)->insertGetId($data['units']);
-        $data['product_unit']=Db::name('production')->strict(false)->insertGetId($data['production']);
-        $data['sample_unit']=$this->request->user['unit_id']->getValue();
+        //写入抽样单信息，并返回抽样单cyd ID
+        $cyd_id = (new Cyd())->createSample($cyd_data);
+
+        //写入cydID
+        $unit_test['cyd_id']=$unit_production['cyd_id']=$unit_sample['cyd_id']=$cyd_id;
+
+        //写入受检单位信息，并返回自增id
+        $unit_test_id = (new UnitTest())->insertUnitTestDataGetId($unit_test);
+        //写入生产单位信息，并返回自增id
+        $unit_production_id = (new UnitProduction())->insertUnitProductionDataGetId($unit_production);
+        //写入抽样单位信息，并返回自增id
+        $unit_sample_id=(new UnitSample())->insertUnitSampleDataGetId($unit_sample);
+
+        //将各种id写入cyd
+        $cyd_id_data = [
+            'test_id' => '',//检测单位id
+            'units_id' => $unit_test_id,//受检单位id
+            'product_unit' => $unit_production_id,//生产单位id
+            'sample_unit' => $unit_sample_id,//抽样单位id
+        ];
+        $result = (new Cyd())->updateCydDataByID($cyd_id,$cyd_id_data);
+
+        return $result;
     }
 
 }

app/api/controller/v1/Sample.php

@@ -38,9 +38,69 @@ class Sample
 
     public function createSample()
     {
-        $data = request()->param();
 
-        return $data;
+        //受检单位信息
+        $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_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'),//生产方式
+        ];
+
+        //抽样单位信息
+        $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'),
+        ];
+
+//抽样单cyd信息
+        $cyd_data = [
+            'sample_id' => request()->param('sample_id','','trim'),
+            'task_id' => request()->param('task_id','','trim'),//关联任务id
+            '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
+
+            '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'),
+            'file_name' => request()->param('file_name','','trim'),//文件名
+            'file_url' => request()->param('file_url','','trim'),//文件链接
+        ];
+
+        $result = (new SampleBus())->createSample($unit_test, $unit_production, $unit_sample, $cyd_data);
+        return showSuccess($result);
     }
 
 }

app/api/controller/v1/Superviser.php

@@ -51,7 +51,7 @@ class Superviser
             'file_name' => request()->param('file_name', '', 'trim'),//附件名称
             'releaser' => request()->param('releaser', '', 'trim'),//发布单位//todo 固定好的，禁止修改，不需要传参
             'task_class' => request()->param('task_class', '', 'trim'),//任务类型：task_class
-            'ispublic' => request()->param('ispublic', 0, 'trim'),//发布状态 todo 默认为0
+            'ispublic' => request()->param('ispublic', 0, 'trim'),//发布状态 
             'main_unit' => request()->param('main_unit', '', 'trim'),//牵头单位 //是orgs的name字段 二班，三班，四班，
         ];
         $orgs=request()->param('orgs', '', 'trim');

app/api/model/Ccjc.php

@@ -38,17 +38,10 @@ class Ccjc extends model{
 
     public function selectUndertakeData($task_class,$where, $pageNum, $pageSize)
     {
-//        $Ccjc = new Ccjc();
-//        return $Ccjc->where('task_class','=',$task_class)
-//            ->with([
-//                'undertake'=> function ($query) use ($where){
-//                    $query->where($where);
-//                }
-//            ])->page($pageNum,$pageSize)->select();
-        return Ccjc::hasWhere('undertake', function ($query) use ($where){
+        $result = Ccjc::hasWhere('undertake', function ($query) use ($where){
             $query->where($where);
         })->where('task_class','=',$task_class)->select();
-
+        return $result;
     }
     public function countUndertakeData($task_class,$where)
     {

app/api/model/Cyd.php

@@ -35,8 +35,20 @@ class Cyd extends Model
         return $count;
     }
 
+    public function createSample($cyd_data)
+    {
+        $result = $this->insertGetId($cyd_data);
+        return $result;
+    }
+
+    public function updateCydDataByID($id, $data)
+    {
+        $result = $this->where('id','=',$id)->save($data);
+        return $result;
+    }
+
 
-    //用于生成抽样单编号的，意义不明确
+    //用于生成抽样单编号的
     public function countSampleCreateID()
     {
         return $this->whereDay('createtime','today')->count();

app/api/model/UnitProduction.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ *User:Administrator
+ *Date:2021/10/23
+ */
+
+namespace app\api\model;
+
+use think\Model;
+
+class UnitProduction extends Model
+{
+    public function insertUnitProductionDataGetId(array $unit_production)
+    {
+        return parent::insertGetId($unit_production);
+    }
+}

app/api/model/UnitSample.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ *
+ *User:Administrator
+ *Date:2021/10/23
+ */
+
+namespace app\api\model;
+
+use think\Model;
+
+class UnitSample extends Model
+{
+    public function insertUnitSampleDataGetId(array $data)
+    {
+        return parent::insertGetId($data);
+    }
+}

app/api/model/UnitsTest.php

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

app/api/validate/User.php

@@ -19,8 +19,8 @@ class User extends Validate
     ];
 
     protected $message = [
-        'username.require' => '用户名不能为空',
-        'password.require' => '密码不能为空',
+        'username.require' => 'require',
+        'password.require' => 'require',
     ];
 
     protected $scene =[