add getSampleObj and createSampleId

app/api/business/SampleBus.php

@@ -35,7 +35,7 @@ class SampleBus
         return ['rows'=>$result,'total'=>$count];
     }
 
-    public function getSampleObj($task_id)
+    public function getSampleObj($task_id,$under_task_id)
     {
         $model_id = (new Ccjc())->getTaskInfoByTaskID($task_id)['test_model_id'];
         $data = (new TestModel())->getProductInfo($model_id);
@@ -44,6 +44,22 @@ class SampleBus
 
     }
 
+    public function createSampleId($task_id)
+    {
+        $task_class = (new Ccjc())->getTaskInfoByTaskID($task_id)['task_class'];
+        $count = (new Cyd())->countSampleCreateID();
+
+        if ($task_class=="例行监测") {
+            $id['id'] = 'LXJC' . date('Y') . date('m') . date('d') . date('H') . date('m') . str_pad(($count + 1), 4, 0, STR_PAD_LEFT);
+        }
+        if ($task_class=='专项监测'){
+            $id['id'] = 'ZXJC'.date('Y').date('m').date('d').date('H').date('m').str_pad(($count+1),4,0,STR_PAD_LEFT);
+        }
+        return $id;
+    }
+
+
+
     public function createSample()
     {
         ///todo 没写呢

app/api/controller/v1/Login.php

@@ -8,7 +8,9 @@
 namespace app\api\controller\v1;
 
 use app\api\business\LoginBus;
+use app\api\validate\User;
 use app\BaseController;
+use think\exception\ValidateException;
 
 class Login extends BaseController
 {
@@ -19,10 +21,20 @@ class Login extends BaseController
         if (!$this->request->isPost()) return showError(config('status.illegal_request'));
         //todo validate
 
-        $username = $this->request->param('login_name', '', 'trim');
-        $password = $this->request->param('pwd', '', 'trim');
+        $data = [
+            'username'=>$this->request->param('login_name', '', 'trim'),
+            'password'=>$this->request->param('pwd', '', 'trim'),
+        ];
 
-        $res=(new LoginBus())->login($username,$password);
+        //todo validate
+//        try {
+//            $this->validate(User::class)->scene('login')->check($data);
+//        } catch (ValidateException $exception) {
+//            return show('11', $exception->getError());
+//        }
+
+
+        $res=(new LoginBus())->login($data['username'],$data['password']);
         return showSuccess($res);
     }
 

app/api/controller/v1/Sample.php

@@ -23,32 +23,24 @@ class Sample
 
     public function getSampleObj()
     {
-        $task_id = request()->param('id','','int');
-        $result = (new SampleBus())->getSampleObj($task_id);
+        $task_id = request()->param('task_id','','int');
+        $under_task_id = request()->param('under_id', '', 'int');
+        $result = (new SampleBus())->getSampleObj($task_id,$under_task_id);
         return showSuccess($result);
     }
 
     public function createSampleId()
     {
-//
-//        $data=$this->request->post();
-//        $task = Db::name('ccjc')->where('id',$data['id'])->field('task_class')->find();
-//        $count = Db::name('cyd')->whereDay('createtime','today')->count();
-//        if($task['task_class']=="例行监测"){
-//            $id['id'] = 'LXJC'.date('Y').date('m').date('d').date('H').date('m').str_pad(($count+1),4,0,STR_PAD_LEFT);
-//        }else{
-//            $id['id'] = 'ZXJC'.date('Y').date('m').date('d').date('H').date('m').str_pad(($count+1),4,0,STR_PAD_LEFT);
-//
-//        }
+        $task_id = request()->param('task_id', '', 'int');
+        $result = (new SampleBus())->createSampleId($task_id);
+        return showSuccess($result);
     }
 
     public function createSample()
     {
+        $data = request()->param();
 
-        return $this->jsonSuccessData($res);
-        $data=[
-            ''
-        ];
+        return $data;
     }
 
 }

app/api/model/Cyd.php

@@ -34,4 +34,11 @@ class Cyd extends Model
         $count = $cyd->with(['Production', 'UnitsTest'])->where($where)->count();
         return $count;
     }
+
+
+    //用于生成抽样单编号的，意义不明确
+    public function countSampleCreateID()
+    {
+        return $this->whereDay('createtime','today')->count();
+    }
 }

app/api/route/app.php

@@ -43,7 +43,7 @@ Route::group(function () {
 
     //填报抽样单
     Route::post(":version.getTestObj",":version.Sample/getSampleObj");        //填报抽样单-step1 获取信息
-   // Route::post(":version.saveSample",":version.Sample/createSample");        //填报抽样单-step2 保存信息
+    Route::post(":version.saveSample",":version.Sample/createSample");        //填报抽样单-step2 保存信息
     Route::post(":version.getSampleId",":version.Sample/createSampleId");        //抽样单中生成样品编码
 
 
@@ -74,7 +74,6 @@ PATCH（UPDATE）：在服务器更新资源（客户端提供改变的属性）
 //
 //Route::post(":version.uploadfile",":version.Sample/uploadfile");        //登录
 //Route::post(":version.test",":version.index/test");        //登录
-//Route::post(":version.saveSample",":version.index/saveSample");        //登录
 //Route::post(":version.getSampleId",":version.index/getSampleId");        //登录
 //Route::post(":version.setSampleStatus",":version.index/setSampleStatus");        //登录
 //Route::post(":version.delSample",":version.index/delSample");        //登录

app/api/validate/User.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ *
+ *User:Administrator
+ *Date:2021/10/22
+ */
+
+namespace app\api\validate;
+
+use think\Validate;
+
+class User extends Validate
+{
+
+    protected $rule = [
+        'username' => 'require',
+        'password' => 'require',
+
+    ];
+
+    protected $message = [
+        'username.require' => '用户名不能为空',
+        'password.require' => '密码不能为空',
+    ];
+
+    protected $scene =[
+        'login' => ['username','password'],
+
+    ];
+}